date:20131220

 sc/source/core/opencl/formulagroupcl.cxx |2 +-
 sc/source/core/opencl/op_financial.cxx   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 578aff66c86024bbdb6090cf3ed99914a41a9229
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Dec 20 10:05:38 2013 +0200

WaE: statement aligned ... [loplugin]

Change-Id: Ifd2693b36418fa6506ffac1584688e13e7f913f3

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 7e8e008..f3a3105 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -3232,7 +3232,7 @@ CompiledFormula* 
FormulaGroupInterpreterOpenCL::createCompiledFormula(ScDocument
 
 DynamicKernel *result = DynamicKernel::create(rDoc, rTopPos, *pCode);
 if ( result )
-result-SetPCode(pCode);
+result-SetPCode(pCode);
 return result;
 }
 
diff --git a/sc/source/core/opencl/op_financial.cxx 
b/sc/source/core/opencl/op_financial.cxx
index 5515951..216e7e9 100644
--- a/sc/source/core/opencl/op_financial.cxx
+++ b/sc/source/core/opencl/op_financial.cxx
@@ -3657,7 +3657,7 @@ vSubArguments)
 for (unsigned i = 0; i  vSubArguments.size(); i++)
 {
   if (i)
-  ss  ,;
+  ss  ,;
   vSubArguments[i]-GenSlidingWindowDecl(ss);
 }
 ss  ) {\n;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/experimental

 ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m |   47 
+-
 1 file changed, 28 insertions(+), 19 deletions(-)

New commits:
commit b8a1af35cc565248f6d103f526488fa7cc44ac38
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Dec 20 10:47:52 2013 +0200

Improve the tiles per second calculation

Avoid an implicit upper limit on the value calculated (and displayed) by
keeping a counter, too, for each slot in the array.

Also edit a comment, as I now have a better understanding of how the
tiling works.

Change-Id: I5df4076917a244f73f27b66f4983f17ce95b9df7

diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m
index 3756cd2..88c3095 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m
@@ -22,24 +22,28 @@
 static const int NTIMESTAMPS = 100;
 static const CFTimeInterval AVERAGINGTIME = 5;
 
-static CFTimeInterval tileTimestamps[NTIMESTAMPS];
-static int curFirstTimestamp = 0;
-static int curNextTimestamp = 0;
+static struct {
+CFTimeInterval timestamp;
+int count;
+} tileTimestamps[NTIMESTAMPS];
+static int oldestTimestampIndex = 0;
+static int nextTimestampIndex = 0;
 
 static void dropOldTimestamps(CFTimeInterval now)
 {
 // Drop too old timestamps
-while (curFirstTimestamp != curNextTimestamp  now - 
tileTimestamps[curFirstTimestamp] = AVERAGINGTIME)
-curFirstTimestamp = (curFirstTimestamp + 1) % NTIMESTAMPS;
+while (oldestTimestampIndex != nextTimestampIndex  now - 
tileTimestamps[oldestTimestampIndex].timestamp = AVERAGINGTIME)
+oldestTimestampIndex = (oldestTimestampIndex + 1) % NTIMESTAMPS;
 }
 
 static void updateTilesPerSecond(UILabel *label)
 {
-int n = (curNextTimestamp  curFirstTimestamp) ?
-(NTIMESTAMPS - (curFirstTimestamp - curNextTimestamp))
-: ((curNextTimestamp - curFirstTimestamp));
+int n = 0;
 
-// NSLog(@first:%d next:%d n:%d, curFirstTimestamp, curNextTimestamp, n);
+for (int k = oldestTimestampIndex; k != nextTimestampIndex; k = (k + 1) % 
NTIMESTAMPS)
+n += tileTimestamps[k].count;
+
+// NSLog(@oldest:%d next:%d n:%d, oldestTimestampIndex, 
nextTimestampIndex, n);
 
 double tps = n/AVERAGINGTIME;
 
@@ -54,10 +58,13 @@ static void updateTilesPerSecond(UILabel *label)
 dropOldTimestamps(now);
 
 // Add new timestamp
-tileTimestamps[curNextTimestamp] = now;
+tileTimestamps[nextTimestampIndex].timestamp = now;
+tileTimestamps[nextTimestampIndex].count++;
 // Let next added replace newest if array full
-if (curFirstTimestamp != (curNextTimestamp + 1) % NTIMESTAMPS)
-curNextTimestamp = (curNextTimestamp + 1) % NTIMESTAMPS;
+if (oldestTimestampIndex != (nextTimestampIndex + 1) % NTIMESTAMPS) {
+nextTimestampIndex = (nextTimestampIndex + 1) % NTIMESTAMPS;
+tileTimestamps[nextTimestampIndex].count = 0;
+}
 
 updateTilesPerSecond(((View *) [self superview]).tpsLabel);
 }
@@ -114,13 +121,15 @@ static void updateTilesPerSecond(UILabel *label)
 
 // NSLog(@bb:%.0fx%.0f@(%.0f,%.0f) zoomScale:%.0f tile:%.0fx%.0f 
at:(%.0f,%.0f) size:%.0fx%.0f, bb.size.width, bb.size.height, bb.origin.x, 
bb.origin.y, zoomScale, tileSize.width, tileSize.height, 
bb.origin.x/self.scale, bb.origin.y/self.scale, bb.size.width/self.scale, 
bb.size.height/self.scale);
 
-// I don't really claim to fully understand all this. It does seem
-// a bit weird to be passing in a context width x height (in the
-// terminology of touch_lo_draw_tile) of 64x64, for instance, even
-// if that tile is actually going to be rendered to 128x128 actual
-// pixels. But this seems to work. Other combinations, applying
-// scaling to the CTM, etc, don't. But maybe I haven't tried hard
-// enough.
+// I don't really claim to fully understand all this. It did at
+// first seem a bit weird to be passing in a context width x
+// height (in the terminology of touch_lo_draw_tile) of 64x64,
+// for instance, even if that tile is actually going to be
+// rendered to 128x128 on-screen pixels. But what I tend to forget
+// is that this 64x64 is in the coordinate space of the initial
+// view of the document; the CGContext keeps track of scaling it
+// as needed at the current zoom levels. I keep thinking about
+// pixels incorrectly.
 
 touch_lo_draw_tile(ctx,
tileSize.width, tileSize.height,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 1b/5627354188efe436c8a04eb39b72f3eba89d50

 1b/5627354188efe436c8a04eb39b72f3eba89d50 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d47e6d15550630e367c78baa089d806018e38fec
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Dec 20 08:56:42 2013 +

Notes added by 'git notes add'

diff --git a/1b/5627354188efe436c8a04eb39b72f3eba89d50 
b/1b/5627354188efe436c8a04eb39b72f3eba89d50
new file mode 100644
index 000..ac28451
--- /dev/null
+++ b/1b/5627354188efe436c8a04eb39b72f3eba89d50
@@ -0,0 +1 @@
+prefer: 593ae387ceda893b479dd25008403a0cd8b42543
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ac/a4c3f0c6aa4986d1d5a266102ed141b8368be7

 ac/a4c3f0c6aa4986d1d5a266102ed141b8368be7 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 95c5c802ddf4a71a20e46441984818b9bd6c3803
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Dec 20 08:58:36 2013 +

Notes added by 'git notes add'

diff --git a/ac/a4c3f0c6aa4986d1d5a266102ed141b8368be7 
b/ac/a4c3f0c6aa4986d1d5a266102ed141b8368be7
new file mode 100644
index 000..a68d32a
--- /dev/null
+++ b/ac/a4c3f0c6aa4986d1d5a266102ed141b8368be7
@@ -0,0 +1 @@
+prefer: 1e98189eaea67fb1e866e0114bd1ab835dbc5ec7
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f1/b290cdb3683a4fb05dc68145f480b54e2850cf

 f1/b290cdb3683a4fb05dc68145f480b54e2850cf |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 86db7a3b6c4abcfc182e4abefc5c233f6b5a86af
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Dec 20 09:00:47 2013 +

Notes added by 'git notes add'

diff --git a/f1/b290cdb3683a4fb05dc68145f480b54e2850cf 
b/f1/b290cdb3683a4fb05dc68145f480b54e2850cf
new file mode 100644
index 000..0c31934e
--- /dev/null
+++ b/f1/b290cdb3683a4fb05dc68145f480b54e2850cf
@@ -0,0 +1 @@
+prefer: 1379294741ff85d4c09d9ded7579ad50dea88fb7
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - fb/7d72f102e097a2a8154b8d9300aa367f3057c0

 fb/7d72f102e097a2a8154b8d9300aa367f3057c0 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c481fdbb3828f2df16515e5397e5c935dda434c7
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Dec 20 09:01:38 2013 +

Notes added by 'git notes add'

diff --git a/fb/7d72f102e097a2a8154b8d9300aa367f3057c0 
b/fb/7d72f102e097a2a8154b8d9300aa367f3057c0
new file mode 100644
index 000..d3874cf
--- /dev/null
+++ b/fb/7d72f102e097a2a8154b8d9300aa367f3057c0
@@ -0,0 +1 @@
+prefer: e8b50bde720e434290c5e0ec22014d33b025f7d9
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - d0/f397f3b0e0a650df2813805a894e9a29943c1d

 d0/f397f3b0e0a650df2813805a894e9a29943c1d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 945f0aab852f88aabe4a5f6ee59c52aa8d96925e
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Dec 20 09:07:26 2013 +

Notes added by 'git notes add'

diff --git a/d0/f397f3b0e0a650df2813805a894e9a29943c1d 
b/d0/f397f3b0e0a650df2813805a894e9a29943c1d
new file mode 100644
index 000..8c3572b
--- /dev/null
+++ b/d0/f397f3b0e0a650df2813805a894e9a29943c1d
@@ -0,0 +1 @@
+prefer: 61f6193d26615e5849a97d670f77d71c7f7d8dea
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 01/64d67071d06aa42213c4a66765b5d032ca84d3

 01/64d67071d06aa42213c4a66765b5d032ca84d3 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 09c8a12078aeeba3d2a6710be3f2704de209ddf0
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Dec 20 09:25:10 2013 +

Notes added by 'git notes add'

diff --git a/01/64d67071d06aa42213c4a66765b5d032ca84d3 
b/01/64d67071d06aa42213c4a66765b5d032ca84d3
new file mode 100644
index 000..faeb91c
--- /dev/null
+++ b/01/64d67071d06aa42213c4a66765b5d032ca84d3
@@ -0,0 +1 @@
+merged as: 5f7d39a07e108385b34c00e95dfdf734ad8f1f56
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 include/svtools/table/tablemodel.hxx|4 
 svtools/source/table/gridtablerenderer.cxx  |   16 +++-
 svtools/source/table/tablecontrol_impl.cxx  |4 
 svtools/source/uno/svtxgridcontrol.cxx  |   15 +++
 svtools/source/uno/svtxgridcontrol.hxx  |3 +++
 svtools/source/uno/unocontroltablemodel.cxx |   17 +
 svtools/source/uno/unocontroltablemodel.hxx |2 ++
 7 files changed, 56 insertions(+), 5 deletions(-)

New commits:
commit 5f7d39a07e108385b34c00e95dfdf734ad8f1f56
Author: JÃ¼rgen Schmidt j...@apache.org
Date:   Fri Dec 20 05:47:11 2013 +

Resolves: #i120065# apply patch for Enabled property in grid model

Patch By: hanya
Review By: jsc

(cherry picked from commit 0164d67071d06aa42213c4a66765b5d032ca84d3)

Change-Id: Iad363b75dd30722b10139b31c90b3d598deaaf30

diff --git a/include/svtools/table/tablemodel.hxx 
b/include/svtools/table/tablemodel.hxx
index 38d1c28..0711bb0 100644
--- a/include/svtools/table/tablemodel.hxx
+++ b/include/svtools/table/tablemodel.hxx
@@ -525,6 +525,10 @@ namespace svt { namespace table
 */
 virtual ITableDataSort* getSortAdapter() = 0;
 
+/** returns enabled state.
+*/
+virtual bool isEnabled() const = 0;
+
 /// destroys the table model instance
 virtual ~ITableModel() { }
 };
diff --git a/svtools/source/table/gridtablerenderer.cxx 
b/svtools/source/table/gridtablerenderer.cxx
index ca99192..585d97e 100644
--- a/svtools/source/table/gridtablerenderer.cxx
+++ b/svtools/source/table/gridtablerenderer.cxx
@@ -260,7 +260,9 @@ namespace svt { namespace table
 _rDevice.SetTextColor( textColor );
 
 Rectangle const aTextRect( lcl_getTextRenderingArea( 
lcl_getContentArea( *m_pImpl, _rArea ) ) );
-sal_uLong const nDrawTextFlags = lcl_getAlignmentTextDrawFlags( 
*m_pImpl, _nCol ) | TEXT_DRAW_CLIP;
+sal_uLong nDrawTextFlags = lcl_getAlignmentTextDrawFlags( *m_pImpl, 
_nCol ) | TEXT_DRAW_CLIP;
+if ( !m_pImpl-rModel.isEnabled() )
+nDrawTextFlags |= TEXT_DRAW_DISABLE;
 _rDevice.DrawText( aTextRect, sHeaderText, nDrawTextFlags );
 
 ::boost::optional ::Color  const aLineColor( 
m_pImpl-rModel.getLineColor() );
@@ -396,7 +398,9 @@ namespace svt { namespace table
 _rDevice.SetTextColor( textColor );
 
 Rectangle const aTextRect( lcl_getTextRenderingArea( 
lcl_getContentArea( *m_pImpl, _rArea ) ) );
-sal_uLong const nDrawTextFlags = lcl_getAlignmentTextDrawFlags( 
*m_pImpl, 0 ) | TEXT_DRAW_CLIP;
+sal_uLong nDrawTextFlags = lcl_getAlignmentTextDrawFlags( 
*m_pImpl, 0 ) | TEXT_DRAW_CLIP;
+if ( !m_pImpl-rModel.isEnabled() )
+nDrawTextFlags |= TEXT_DRAW_DISABLE;
 // TODO: is using the horizontal alignment of the 0'th column 
a good idea here? This is pretty ... arbitray ..
 _rDevice.DrawText( aTextRect, rowTitle, nDrawTextFlags );
 }
@@ -500,8 +504,8 @@ namespace svt { namespace table
 }
 else
 imageSize.Height() = i_context.aContentArea.GetHeight() - 1;
-
-i_context.rDevice.DrawImage( imagePos, imageSize, i_image, 0 );
+sal_uInt16 const nStyle = m_pImpl-rModel.isEnabled() ? 0 : 
IMAGE_DRAW_DISABLE;
+i_context.rDevice.DrawImage( imagePos, imageSize, i_image, nStyle );
 }
 
 
//--
@@ -546,7 +550,9 @@ namespace svt { namespace table
 }
 
 Rectangle const textRect( lcl_getTextRenderingArea( 
i_context.aContentArea ) );
-sal_uLong const nDrawTextFlags = lcl_getAlignmentTextDrawFlags( 
*m_pImpl, i_context.nColumn ) | TEXT_DRAW_CLIP;
+sal_uLong nDrawTextFlags = lcl_getAlignmentTextDrawFlags( *m_pImpl, 
i_context.nColumn ) | TEXT_DRAW_CLIP;
+if ( !m_pImpl-rModel.isEnabled() )
+nDrawTextFlags |= TEXT_DRAW_DISABLE;
 i_context.rDevice.DrawText( textRect, i_text, nDrawTextFlags );
 }
 
diff --git a/svtools/source/table/tablecontrol_impl.cxx 
b/svtools/source/table/tablecontrol_impl.cxx
index f4238c9..7a849be 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -210,6 +210,10 @@ namespace svt { namespace table
 {
 return NULL;
 }
+virtual bool isEnabled() const
+{
+return true;
+}
 virtual void getCellContent( ColPos const i_col, RowPos const i_row, 
::com::sun::star::uno::Any o_cellContent )
 {
 (void)i_row;
diff --git a/svtools/source/uno/svtxgridcontrol.cxx 
b/svtools/source/uno/svtxgridcontrol.cxx
index 5397dc7..6fadfcc 100644
--- a/svtools/source/uno/svtxgridcontrol.cxx
+++ b/svtools/source/uno/svtxgridcontrol.cxx
@@ -853,6 +853,21 @@ void SVTXGridControl::ProcessWindowEvent( const

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

 oox/source/drawingml/shape.cxx |   51 +
 1 file changed, 51 insertions(+)

New commits:
commit 361bad18d8ab8df1fe852d60d97ca8ce976d1de4
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Fri Dec 20 10:23:56 2013 +0100

oox: import textframe shadow from drawingml

CppunitTest_sw_ooxmlexport's testTextFrameBorders is a reproducer for
this problem.

Change-Id: I5e164c6c151caca62e5b4464e7ed3708f59ada82

diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index a28b1b4..1406567 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -52,6 +52,7 @@
 #include com/sun/star/drawing/GraphicExportFilter.hpp
 #include com/sun/star/text/XText.hpp
 #include com/sun/star/table/BorderLine2.hpp
+#include com/sun/star/table/ShadowFormat.hpp
 #include com/sun/star/chart2/XChartDocument.hpp
 #include com/sun/star/style/ParagraphAdjust.hpp
 #include com/sun/star/io/XOutputStream.hpp
@@ -642,6 +643,56 @@ Reference XShape  Shape::createAndInsert(
 }
 aShapeProps.erase(PROP_LineColor);
 }
+
+// TextFrames have ShadowFormat, not individual shadow 
properties.
+boost::optionalsal_Int32 oShadowDistance;
+if (aShapeProps.hasProperty(PROP_ShadowXDistance))
+{
+oShadowDistance = 
aShapeProps[PROP_ShadowXDistance].getsal_Int32();
+aShapeProps.erase(PROP_ShadowXDistance);
+}
+if (aShapeProps.hasProperty(PROP_ShadowYDistance))
+{
+// There is a single 'dist' attribute, so no need to count 
the avg of x and y.
+aShapeProps.erase(PROP_ShadowYDistance);
+}
+boost::optionalsal_Int32 oShadowColor;
+if (aShapeProps.hasProperty(PROP_ShadowColor))
+{
+oShadowColor = 
aShapeProps[PROP_ShadowColor].getsal_Int32();
+aShapeProps.erase(PROP_ShadowColor);
+}
+if (aShapeProps.hasProperty(PROP_Shadow))
+aShapeProps.erase(PROP_Shadow);
+
+if (oShadowDistance || oShadowColor || 
aEffectProperties.maShadow.moShadowDir.has())
+{
+css::table::ShadowFormat aFormat;
+if (oShadowColor)
+aFormat.Color = *oShadowColor;
+if (aEffectProperties.maShadow.moShadowDir.has())
+{
+css::table::ShadowLocation nLocation = 
css::table::ShadowLocation_NONE;
+switch (aEffectProperties.maShadow.moShadowDir.get())
+{
+case 1350:
+nLocation = css::table::ShadowLocation_TOP_LEFT;
+break;
+case 1890:
+nLocation = css::table::ShadowLocation_TOP_RIGHT;
+break;
+case 810:
+nLocation = css::table::ShadowLocation_BOTTOM_LEFT;
+break;
+case 270:
+nLocation = 
css::table::ShadowLocation_BOTTOM_RIGHT;
+break;
+}
+aFormat.Location = nLocation;
+}
+aFormat.ShadowWidth = *oShadowDistance;
+aShapeProps.setProperty(PROP_ShadowFormat, 
uno::makeAny(aFormat));
+}
 }
 
 PropertySet( xSet ).setProperties( aShapeProps );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: minutes of ESC call ...


On Thu, 2013-12-19 at 22:24 +0100, Cor Nouws wrote:
 Michael Meeks wrote (19-12-13 21:24)
  * Pending Action Items:
  + need design for copying styles between templates (Cor Nouws/other UX?)
  cf. 
  http://www.mail-archive.com/libreoffice-ux-advise@lists.freedesktop.org/msg01658.html
  
  http://www.mail-archive.com/libreoffice-ux-advise@lists.freedesktop.org/msg01663.html
 
 Thanks for having that here.
 It's on my wish list (= portal to a todo list) to have a clear state of
 wishes etc, in this area.

IIRC we had some ux-advise bugzilla bridge here, so presumably we could
queue all the open tasks and just query the UX component there for open
tasks ?

ATB,

Michael.

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

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

Re: minutes of ESC call ...

2013-12-20 Thread Cor Nouws

Michael Meeks wrote (20-12-13 10:36)
 
 On Thu, 2013-12-19 at 22:24 +0100, Cor Nouws wrote:
 Michael Meeks wrote (19-12-13 21:24)
 * Pending Action Items:
 + need design for copying styles between templates (Cor Nouws/other UX?)
 cf. 
 http://www.mail-archive.com/libreoffice-ux-advise@lists.freedesktop.org/msg01658.html
 
 http://www.mail-archive.com/libreoffice-ux-advise@lists.freedesktop.org/msg01663.html

 Thanks for having that here.
 It's on my wish list (= portal to a todo list) to have a clear state of
 wishes etc, in this area.
 
   IIRC we had some ux-advise bugzilla bridge here, so presumably we could
 queue all the open tasks and just query the UX component there for open
 tasks ?

Yes that would help.
But for what I've seen, quite a number of issues around this, is not in
a well triaged  clarified state. Some work to be done there first, IMO,
to prevent something is missed. (And cleaning up bugzilla around certain
tasks is a always good of course.)

Cheers,
Cor



-- 
 - Cor Nouws
 - http://nl.libreoffice.org
 - The Document Foundation Membership Committee Member
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 91/e3fca93d3a0b51e8f1ea87df902d928a7005ca

 91/e3fca93d3a0b51e8f1ea87df902d928a7005ca |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b0d8e948b52053ea463814d785e1de8375078a35
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Dec 20 10:18:53 2013 +

Notes added by 'git notes add'

diff --git a/91/e3fca93d3a0b51e8f1ea87df902d928a7005ca 
b/91/e3fca93d3a0b51e8f1ea87df902d928a7005ca
new file mode 100644
index 000..c77c2a0
--- /dev/null
+++ b/91/e3fca93d3a0b51e8f1ea87df902d928a7005ca
@@ -0,0 +1 @@
+merged as: 842cb0da2ec72bafbd16fd50e5d780285227e452
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ff/da23c2189f722975b657313c743be55d8dc664

 ff/da23c2189f722975b657313c743be55d8dc664 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit bcdb5208e0bd7efe12122ee77e1f528751836669
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Dec 20 10:19:42 2013 +

Notes added by 'git notes add'

diff --git a/ff/da23c2189f722975b657313c743be55d8dc664 
b/ff/da23c2189f722975b657313c743be55d8dc664
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/ff/da23c2189f722975b657313c743be55d8dc664
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 4e/69ff79889ed316d7429a94d3085af81cba1652 e0/932e5413c492ca1f94c7b160bac8563a5313b1

 4e/69ff79889ed316d7429a94d3085af81cba1652 |1 +
 e0/932e5413c492ca1f94c7b160bac8563a5313b1 |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 07d67ba7f6277b1e628e806169dfc82ae8fd0be3
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Dec 20 10:20:20 2013 +

Notes added by 'git notes add'

diff --git a/e0/932e5413c492ca1f94c7b160bac8563a5313b1 
b/e0/932e5413c492ca1f94c7b160bac8563a5313b1
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/e0/932e5413c492ca1f94c7b160bac8563a5313b1
@@ -0,0 +1 @@
+ignore: aoo
commit d251fcef4fc89d8b4e9af8876108dadc8928a3a0
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Dec 20 10:20:11 2013 +

Notes added by 'git notes add'

diff --git a/4e/69ff79889ed316d7429a94d3085af81cba1652 
b/4e/69ff79889ed316d7429a94d3085af81cba1652
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/4e/69ff79889ed316d7429a94d3085af81cba1652
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 3 commits - 09/251c06fbd121754eaa30b0a17d82e379d7cd50 17/8870fb5e628d9d4933c8e7ada9827366a16f66 e7/d8672bca2beac2cf38dc88625745876d080bd4

 09/251c06fbd121754eaa30b0a17d82e379d7cd50 |1 +
 17/8870fb5e628d9d4933c8e7ada9827366a16f66 |1 +
 e7/d8672bca2beac2cf38dc88625745876d080bd4 |1 +
 3 files changed, 3 insertions(+)

New commits:
commit e5a646d9d1c3c3c788ea2a081959b9cc40294d23
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Dec 20 10:20:46 2013 +

Notes added by 'git notes add'

diff --git a/e7/d8672bca2beac2cf38dc88625745876d080bd4 
b/e7/d8672bca2beac2cf38dc88625745876d080bd4
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/e7/d8672bca2beac2cf38dc88625745876d080bd4
@@ -0,0 +1 @@
+ignore: aoo
commit 834ca2d243e07ef4cc282a2da22fbfa956b86c83
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Dec 20 10:20:38 2013 +

Notes added by 'git notes add'

diff --git a/09/251c06fbd121754eaa30b0a17d82e379d7cd50 
b/09/251c06fbd121754eaa30b0a17d82e379d7cd50
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/09/251c06fbd121754eaa30b0a17d82e379d7cd50
@@ -0,0 +1 @@
+ignore: aoo
commit babb8973c407fb5baa580b628dfcb268ae7513f3
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Dec 20 10:20:31 2013 +

Notes added by 'git notes add'

diff --git a/17/8870fb5e628d9d4933c8e7ada9827366a16f66 
b/17/8870fb5e628d9d4933c8e7ada9827366a16f66
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/17/8870fb5e628d9d4933c8e7ada9827366a16f66
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 43/c1464a94bd652130a92b5d35adf8a587e9ed49 78/105276ab2700131d00c2f10166ad906a0432ce

 43/c1464a94bd652130a92b5d35adf8a587e9ed49 |1 +
 78/105276ab2700131d00c2f10166ad906a0432ce |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 2522b793666a90999cde31ebc290359e646390dc
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Dec 20 10:21:22 2013 +

Notes added by 'git notes add'

diff --git a/43/c1464a94bd652130a92b5d35adf8a587e9ed49 
b/43/c1464a94bd652130a92b5d35adf8a587e9ed49
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/43/c1464a94bd652130a92b5d35adf8a587e9ed49
@@ -0,0 +1 @@
+ignore: aoo
commit 00fc99648d4036a844650565e89d9d74b66abfde
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Dec 20 10:21:15 2013 +

Notes added by 'git notes add'

diff --git a/78/105276ab2700131d00c2f10166ad906a0432ce 
b/78/105276ab2700131d00c2f10166ad906a0432ce
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/78/105276ab2700131d00c2f10166ad906a0432ce
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 oox/source/drawingml/shape.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 2b6c7519f69b43636028de8c15b1981e0328361f
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Fri Dec 20 11:14:29 2013 +0100

oox: import textframe border line width from drawingml

With this, CppunitTest_sw_ooxmlexport's testTextFrameBorders finally
pases, even in experimental mode.

Change-Id: I393bf1089702004956124c6aaad594ed32804b71

diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 1406567..a6e61a7 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -639,6 +639,8 @@ Reference XShape  Shape::createAndInsert(
 {
 css::table::BorderLine2 aBorderLine = 
xPropertySet-getPropertyValue(PropertyMap::getPropertyName(aBorders[i])).getcss::table::BorderLine2();
 aBorderLine.Color = 
aShapeProps[PROP_LineColor].getsal_Int32();
+if (aLineProperties.moLineWidth.has())
+aBorderLine.LineWidth = 
convertEmuToHmm(aLineProperties.moLineWidth.get());
 aShapeProps.setProperty(aBorders[i], 
uno::makeAny(aBorderLine));
 }
 aShapeProps.erase(PROP_LineColor);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - offapi/com

 offapi/com/sun/star/presentation/XSlideShowController.idl |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 45165c44b30c9577bc4d6e8b541616af69ece640
Author: JÃ¼rgen Schmidt j...@apache.org
Date:   Fri Dec 20 05:48:42 2013 +

Resolves: #i121943# apply patch for PenWidth attribute

Patch By: hanya
Review By: jsc

(cherry picked from commit 91e3fca93d3a0b51e8f1ea87df902d928a7005ca)

Conflicts:
offapi/com/sun/star/presentation/XSlideShowController.idl

Change-Id: I3709ee605efc4b5b80e293eb34245c9eb0d018cc
(cherry picked from commit 842cb0da2ec72bafbd16fd50e5d780285227e452)

diff --git a/offapi/com/sun/star/presentation/XSlideShowController.idl 
b/offapi/com/sun/star/presentation/XSlideShowController.idl
index a5c619c..2a09cfb 100644
--- a/offapi/com/sun/star/presentation/XSlideShowController.idl
+++ b/offapi/com/sun/star/presentation/XSlideShowController.idl
@@ -238,6 +238,12 @@ interface XSlideShowController
 /** This attribute changes the color of the pen. */
 [attribute] long PenColor;
 
+/** This attribute changes the width of the pen.
+
+@since LibreOffice 4.2
+*/
+[attribute] double PenWidth;
+
 
 /** returns the actual XSlideShow instance that runs the
 slide show.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 48/e79f232701cfc72847548a18808be3333b2b95 85/5a4d0a8cfe9add1c6c19a01c94591cc9b0203a

 48/e79f232701cfc72847548a18808beb2b95 |1 +
 85/5a4d0a8cfe9add1c6c19a01c94591cc9b0203a |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 2f80165b3809911b2410fd5ddc257654d4a8c67b
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Dec 20 10:21:00 2013 +

Notes added by 'git notes add'

diff --git a/85/5a4d0a8cfe9add1c6c19a01c94591cc9b0203a 
b/85/5a4d0a8cfe9add1c6c19a01c94591cc9b0203a
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/85/5a4d0a8cfe9add1c6c19a01c94591cc9b0203a
@@ -0,0 +1 @@
+ignore: aoo
commit e02980bbf594fea9f1e192302bf16fa931624022
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Dec 20 10:20:53 2013 +

Notes added by 'git notes add'

diff --git a/48/e79f232701cfc72847548a18808beb2b95 
b/48/e79f232701cfc72847548a18808beb2b95
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/48/e79f232701cfc72847548a18808beb2b95
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

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

New commits:
commit 000ac1be3c1d24ca74103f0b424e60bf213a6bad
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Dec 20 10:28:50 2013 +

Updated core
Project: help  309b32b4b137f84d9eae6d84a1a9667da6b62201

diff --git a/helpcontent2 b/helpcontent2
index d78985d..309b32b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d78985d6be013988b7bd5e55fd6ff8e55457dba8
+Subproject commit 309b32b4b137f84d9eae6d84a1a9667da6b62201
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 helpers/help_hid.lst   |8 
 source/text/scalc/01/05030200.xhp  |   10 +-
 source/text/scalc/01/05040200.xhp  |   11 +--
 source/text/shared/01/05340100.xhp |   14 +++---
 source/text/shared/01/05340200.xhp |   12 ++--
 5 files changed, 23 insertions(+), 32 deletions(-)

New commits:
commit 309b32b4b137f84d9eae6d84a1a9667da6b62201
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Dec 20 10:28:50 2013 +

update help ids for col/row dialog .ui conversions

Change-Id: Id5f2c083dfb5247d266fac7ac7a66f4174a139e4

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 342b968..16254d6 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -5993,8 +5993,6 @@ sc_CheckBox_RID_SCDLG_AUTOFORMAT_BTN_NUMFORMAT,1493533716,
 sc_CheckBox_RID_SCDLG_AUTOFORMAT_BTN_PATTERN,1493533720,
 sc_CheckBox_RID_SCDLG_CHARTCOLROW_1,1494516737,
 sc_CheckBox_RID_SCDLG_CHARTCOLROW_2,1494516738,
-sc_CheckBox_RID_SCDLG_COL_MAN_BTN_DEFVAL,1494909953,
-sc_CheckBox_RID_SCDLG_COL_OPT_BTN_DEFVAL,1494926337,
 sc_CheckBox_RID_SCDLG_CONDFORMAT_CBX_COND1,2568520705,
 sc_CheckBox_RID_SCDLG_CONDFORMAT_CBX_COND2,2568520715,
 sc_CheckBox_RID_SCDLG_CONDFORMAT_CBX_COND3,2568520725,
@@ -6035,8 +6033,6 @@ 
sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_IGNEMPTYROWS,2567504921,
 sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_TOTALCOL,2567504923,
 sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_TOTALROW,2567504924,
 sc_CheckBox_RID_SCDLG_RETYPEPASS_INPUT_BTN_MATCH_OLD_PASSWORD,1495680305,
-sc_CheckBox_RID_SCDLG_ROW_MAN_BTN_DEFVAL,1494942721,
-sc_CheckBox_RID_SCDLG_ROW_OPT_BTN_DEFVAL,1494959105,
 sc_CheckBox_RID_SCPAGE_CALC_BTN_CALC,957252625,
 sc_CheckBox_RID_SCPAGE_CALC_BTN_CASE,957252623,
 sc_CheckBox_RID_SCPAGE_CALC_BTN_ITERATE,957252609,
@@ -6141,10 +6137,6 @@ sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT2,956435973,
 sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT3,956435974,
 sc_ListBox_TP_VALIDATION_VALUES_LB_ALLOW,548277762,
 sc_ListBox_TP_VALIDATION_VALUES_LB_VALUE,548277765,
-sc_MetricField_RID_SCDLG_COL_MAN_ED_VALUE,1494915585,
-sc_MetricField_RID_SCDLG_COL_OPT_ED_VALUE,1494931969,
-sc_MetricField_RID_SCDLG_ROW_MAN_ED_VALUE,1494948353,
-sc_MetricField_RID_SCDLG_ROW_OPT_ED_VALUE,1494964737,
 sc_ModalDialog_RID_SCDLG_CHARTCOLROW,1494515712,
 sc_ModalDialog_RID_SCDLG_COLORROW,1494368256,
 sc_ModalDialog_RID_SCDLG_GROUP,1493549056,
diff --git a/source/text/scalc/01/05030200.xhp 
b/source/text/scalc/01/05030200.xhp
index 11ce9d6..378dbc2 100644
--- a/source/text/scalc/01/05030200.xhp
+++ b/source/text/scalc/01/05030200.xhp
@@ -35,7 +35,7 @@
 bookmark_valuerows; optimal heights/bookmark_value
 bookmark_valueoptimal row heights/bookmark_value
 /bookmark
-bookmark xml-lang=en-US branch=hid/.uno:SetOptimalRowHeight 
id=bm_id1299843 localize=false/!-- HID added by script --
+bookmark xml-lang=en-US 
branch=hid/modules/scalc/ui/optimalrowheightdialog/OptimalRowHeightDialog 
id=bm_id1299843 localize=false/
 bookmark xml-lang=en-US branch=hid/.uno:SetOptimalRowHeight 
id=bm_id3145673 localize=false/
 paragraph role=heading id=hd_id3148491 xml-lang=en-US level=1 
l10n=U oldref=1Optimal Row Heights/paragraph
 paragraph role=paragraph id=par_id3154758 xml-lang=en-US l10n=U 
oldref=2variable id=optitextahelp 
hid=.uno:SetOptimalRowHeightDetermines the optimal row height for the 
selected rows./ahelp
@@ -43,11 +43,11 @@
 section id=howtoget
   embed href=text/scalc/00/0405.xhp#fozeiophoe/
 /section
-bookmark xml-lang=en-US 
branch=hid/sc:MetricField:RID_SCDLG_ROW_OPT:ED_VALUE id=bm_id3156280 
localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/scalc/ui/optimalrowheightdialog/value id=bm_id3156280 
localize=false/
 paragraph role=heading id=hd_id3154908 xml-lang=en-US level=2 
l10n=U oldref=3Add/paragraph
-paragraph role=paragraph id=par_id3151044 xml-lang=en-US l10n=U 
oldref=4ahelp hid=SC:METRICFIELD:RID_SCDLG_ROW_OPT:ED_VALUESets 
additional spacing between the largest character in a row and the cell 
boundaries./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/sc:CheckBox:RID_SCDLG_ROW_OPT:BTN_DEFVAL id=bm_id3145271 
localize=false/
+paragraph role=paragraph id=par_id3151044 xml-lang=en-US l10n=U 
oldref=4ahelp hid=modules/scalc/ui/optimalrowheightdialog/valueSets 
additional spacing between the largest character in a row and the cell 
boundaries./ahelp/paragraph
+bookmark xml-lang=en-US 
branch=hid/modules/scalc/ui/optimalrowheightdialog/default id=bm_id3145271 
localize=false/
 paragraph role=heading id=hd_id3150439 xml-lang=en-US level=2 
l10n=U oldref=5Default value/paragraph
-paragraph role=paragraph id=par_id3146984 xml-lang=en-US l10n=U 
oldref=6ahelp hid=SC:CHECKBOX:RID_SCDLG_ROW_OPT:BTN_DEFVALRestores the 
default value for the optimal row height./ahelp/paragraph
+paragraph role=paragraph id=par_id3146984 xml-lang=en-US l10n=U 
oldref=6ahelp 
hid=modules/scalc/ui/optimalrowheightdialog/defaultRestores the default 
value for the optimal row height./ahelp/paragraph
 /body

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

 ios/experimental/LibreOffice/LibreOffice/lo.mm   |4 --
 ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm |4 --
 solenv/gbuild/Library.mk |   21 +--
 3 files changed, 19 insertions(+), 10 deletions(-)

New commits:
commit 5ed55393ee0778840dd4b3a316086b48bd0c61fc
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Dec 20 12:27:36 2013 +0200

Don't need Base, Calc, Draw and Math functionality here for now

Change-Id: I20b9325f9c7eed1e49ea815c284f8fe1a6ed428d

diff --git a/ios/experimental/LibreOffice/LibreOffice/lo.mm 
b/ios/experimental/LibreOffice/LibreOffice/lo.mm
index bfdbdc5..04760a7 100644
--- a/ios/experimental/LibreOffice/LibreOffice/lo.mm
+++ b/ios/experimental/LibreOffice/LibreOffice/lo.mm
@@ -22,10 +22,6 @@ lo_get_factory_map(void)
 {
 static lib_to_factory_mapping map[] = {
 LO_EXTENDED_CORE_FACTORY_MAP
-LO_BASE_CORE_FACTORY_MAP
-LO_CALC_FACTORY_MAP
-LO_DRAW_CORE_FACTORY_MAP
-LO_MATH_FACTORY_MAP
 LO_WRITER_FACTORY_MAP
 { libcuilo.a, cui_component_getFactory },
 { libspllo.a, spl_component_getFactory },
diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
index 0eaea4e..755ff1a 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
@@ -22,10 +22,6 @@ lo_get_factory_map(void)
 {
 static lib_to_factory_mapping map[] = {
 LO_EXTENDED_CORE_FACTORY_MAP
-LO_BASE_CORE_FACTORY_MAP
-LO_CALC_FACTORY_MAP
-LO_DRAW_CORE_FACTORY_MAP
-LO_MATH_FACTORY_MAP
 LO_WRITER_FACTORY_MAP
 { libcuilo.a, cui_component_getFactory },
 { libspllo.a, spl_component_getFactory },
commit ea61ed8efe8d84b88754b1c6af0a85a76b3ce424
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Dec 20 11:20:45 2013 +0200

Avoid unnecessary library re-building in the DISABLE_DYNLOADING case

In the DISABLE_DYNLOADING case, a gbuild Library is actually a
static archive, so no point in having it depend on other libraries and
be re-created each time one of those have changed.

This hopefully will speed up incremental rebuilds for iOS and Android
nicely, especially in a debugging tree, as the creation of large
static archives with debug information is quite slow.

Change-Id: I17d6a8aeffa65b1e09a7a11544683659c72a50ba

diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 61b5b0f..6ec8278 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -210,8 +210,6 @@ $(eval $(foreach method,\
use_internal_api \
use_internal_bootstrap_api \
use_internal_comprehensive_api \
-   use_libraries \
-   use_static_libraries \
use_external \
use_externals \
use_custom_headers \
@@ -231,4 +229,23 @@ $(eval $(foreach method,\
$(call gb_Library__forward_to_Linktarget,$(method))\
 ))
 
+ifeq ($(DISABLE_DYNLOADING),TRUE)
+
+define gb_Library_use_libraries
+endef
+
+define gb_Library_use_static_libraries
+endef
+
+else
+
+$(eval $(foreach method,\
+   use_libraries \
+   use_static_libraries \
+,\
+   $(call gb_Library__forward_to_Linktarget,$(method))\
+))
+
+endif
+
 # vim: set noet sw=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

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

New commits:
commit 57a80a49ce3726a096a26f49a8e0b7c4f689da54
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Dec 20 10:52:46 2013 +

Updated core
Project: help  ca3c80e54b1effa59c4a80726422d6ac9ab9eff9

diff --git a/helpcontent2 b/helpcontent2
index 309b32b..ca3c80e 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 309b32b4b137f84d9eae6d84a1a9667da6b62201
+Subproject commit ca3c80e54b1effa59c4a80726422d6ac9ab9eff9
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: helpers/help_hid.lst

 helpers/help_hid.lst |1 -
 1 file changed, 1 deletion(-)

New commits:
commit ca3c80e54b1effa59c4a80726422d6ac9ab9eff9
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Dec 20 10:52:46 2013 +

drop unused helpid

Change-Id: I3fd749e6d73710e8eb2b893218413e473eaeb0c1

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 16254d6..7cd6997 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3163,7 +3163,6 @@ HID_SC_SHEET_PAGE_REP,58789,
 HID_SC_SHEET_PAGE_STD,58788,
 HID_SC_SOLVEROPTIONS,59016,
 HID_SC_SOLVEROPTIONS_LB,59017,
-HID_SC_SOLVER_NOSOLUTION,59021,
 HID_SC_SOLVER_PROGRESS,59020,
 HID_SC_SOLVER_SUCCESS,59022,
 HID_SC_SORT_ACTION,58985,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/UIConfig_scalc.mk   |1 
 sc/inc/helpids.h   |1 
 sc/inc/sc.hrc  |1 
 sc/source/ui/inc/optsolver.hrc |2 
 sc/source/ui/inc/optsolver.hxx |8 --
 sc/source/ui/miscdlgs/optsolver.cxx|   14 ---
 sc/source/ui/src/optsolver.src |   36 --
 sc/uiconfig/scalc/ui/nosolutiondialog.ui   |   90 +
 sc/uiconfig/scalc/ui/optimalrowheightdialog.ui |   70 +--
 9 files changed, 103 insertions(+), 120 deletions(-)

New commits:
commit 1822302066fba5a21a8fb72cbaaae9bbe4cf9fbd
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Dec 20 10:46:52 2013 +

convert solver no solution dialog to .ui

Change-Id: I94ba29d328c443e0f944fef8d33fc25cdc0e9694

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 3cd1c63..f55823e 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -99,6 +99,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/leftheaderdialog \
sc/uiconfig/scalc/ui/namerangesdialog \
sc/uiconfig/scalc/ui/managenamesdialog \
+   sc/uiconfig/scalc/ui/nosolutiondialog \
sc/uiconfig/scalc/ui/optcalculatepage \
sc/uiconfig/scalc/ui/optchangespage \
sc/uiconfig/scalc/ui/optcompatibilitypage \
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 9188d40..22526d6 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -163,7 +163,6 @@
 #define HID_SC_SOLVEROPTIONS
SC_HID_SC_SOLVEROPTIONS
 #define HID_SC_SOLVEROPTIONS_LB 
SC_HID_SC_SOLVEROPTIONS_LB
 #define HID_SC_SOLVER_PROGRESS  
SC_HID_SC_SOLVER_PROGRESS
-#define HID_SC_SOLVER_NOSOLUTION
SC_HID_SC_SOLVER_NOSOLUTION
 #define HID_SC_SOLVER_SUCCESS   
SC_HID_SC_SOLVER_SUCCESS
 
 #define HID_SCDLG_CONFLICTS 
SC_HID_SCDLG_CONFLICTS
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 78d887a..000a6e1 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1085,7 +1085,6 @@
 
 #define RID_SCDLG_SOLVEROPTIONS (SC_DIALOGS_START + 139)
 #define RID_SCDLG_SOLVER_PROGRESS   (SC_DIALOGS_START + 142)
-#define RID_SCDLG_SOLVER_NOSOLUTION (SC_DIALOGS_START + 143)
 #define RID_SCDLG_SOLVER_SUCCESS(SC_DIALOGS_START + 144)
 
 #define RID_SCDLG_CONFLICTS (SC_DIALOGS_START + 145)
diff --git a/sc/source/ui/inc/optsolver.hrc b/sc/source/ui/inc/optsolver.hrc
index 5557cf7..f72063e 100644
--- a/sc/source/ui/inc/optsolver.hrc
+++ b/sc/source/ui/inc/optsolver.hrc
@@ -21,8 +21,6 @@
 
 #define FT_PROGRESS 7
 #define FT_TIMELIMIT8
-#define FT_NOSOLUTION   9
-#define FT_ERRORTEXT10
 #define FT_SUCCESS  11
 #define FT_RESULT   12
 #define FT_QUESTION 13
diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx
index ad80ced..aaf756d 100644
--- a/sc/source/ui/inc/optsolver.hxx
+++ b/sc/source/ui/inc/optsolver.hxx
@@ -221,14 +221,10 @@ public:
 
 class ScSolverNoSolutionDialog : public ModalDialog
 {
-FixedText   maFtNoSolution;
-FixedText   maFtErrorText;
-FixedLine   maFlButtons;
-OKButtonmaBtnOk;
+FixedText* m_pFtErrorText;
 
 public:
-ScSolverNoSolutionDialog( Window* pParent, const OUString rErrorText );
-~ScSolverNoSolutionDialog();
+ScSolverNoSolutionDialog(Window* pParent, const OUString rErrorText);
 };
 
 class ScSolverSuccessDialog : public ModalDialog
diff --git a/sc/source/ui/miscdlgs/optsolver.cxx 
b/sc/source/ui/miscdlgs/optsolver.cxx
index 873a81a..d0020e2 100644
--- a/sc/source/ui/miscdlgs/optsolver.cxx
+++ b/sc/source/ui/miscdlgs/optsolver.cxx
@@ -79,18 +79,10 @@ void ScSolverProgressDialog::SetTimeLimit( sal_Int32 
nSeconds )
 //
 
 ScSolverNoSolutionDialog::ScSolverNoSolutionDialog( Window* pParent, const 
OUString rErrorText )
-: ModalDialog( pParent, ScResId( RID_SCDLG_SOLVER_NOSOLUTION ) ),
-maFtNoSolution  ( this, ScResId( FT_NOSOLUTION ) ),
-maFtErrorText   ( this, ScResId( FT_ERRORTEXT ) ),
-maFlButtons ( this, ScResId( FL_BUTTONS ) ),
-maBtnOk ( this, ScResId( BTN_OK ) )
-{
-maFtErrorText.SetText( rErrorText );
-FreeResource();
-}
-
-ScSolverNoSolutionDialog::~ScSolverNoSolutionDialog()
+: ModalDialog(pParent, NoSolutionDialog, 
modules/scalc/ui/nosolutiondialog.ui)
 {
+get(m_pFtErrorText, error);
+m_pFtErrorText-SetText(rErrorText);
 }
 
 //
diff --git a/sc/source/ui/src/optsolver.src b/sc/source/ui/src/optsolver.src
index 477baad..1de4b5e 100644
---

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

2013-12-20 Thread Matúš Kukan

 android/.gitignore   |3 
 android/experimental/DocumentLoader/Makefile |6 +
 android/experimental/DocumentLoader/native-code.cxx  |   45 ---
 android/experimental/LibreOffice4Android/Makefile|5 
 android/experimental/LibreOffice4Android/native-code.cxx |   51 -
 android/experimental/desktop/Makefile|6 +
 android/experimental/desktop/native-code.cxx |   64 ---
 solenv/bin/native-code.py|   85 +++
 8 files changed, 104 insertions(+), 161 deletions(-)

New commits:
commit a17c0950c04693411cc7e46a21c65d45216d8c52
Author: MatÃºÅ¡ Kukan matus.ku...@collabora.com
Date:   Thu Dec 19 15:32:54 2013 +0100

Add tool to generate native-code.cxx for Android.

Should be extended to be helpfull for iOS too.

Change-Id: I862731b6386d5f9cbb508e0c138f45fbe1cb3f46

diff --git a/android/.gitignore b/android/.gitignore
index 9034b98..dca2c57 100644
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -3,4 +3,5 @@ bin
 gen
 libs
 obj
-local.properties
\ No newline at end of file
+local.properties
+native-code.cxx
diff --git a/android/experimental/DocumentLoader/Makefile 
b/android/experimental/DocumentLoader/Makefile
index 49b2895..5295c80 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -11,6 +11,12 @@ APP_PACKAGE=org.libreoffice.android.examples
 BOOTSTRAPDIR=../../Bootstrap
 include $(BOOTSTRAPDIR)/Makefile.shared
 
+native-code.cxx: $(SRCDIR)/solenv/bin/native-code.py
+   $ \
+   -f EXTENDED_CORE -f BASE_CORE -f CALC_CORE -f DRAW_CORE -f MATH 
-f WRITER \
+   -s protocolhandler -s sb \
+$@
+
 copy-stuff:
 # Then assets. Let the directory structure under assets mimic
 # that under solver for now.
diff --git a/android/experimental/DocumentLoader/native-code.cxx 
b/android/experimental/DocumentLoader/native-code.cxx
deleted file mode 100644
index 7cba377..000
--- a/android/experimental/DocumentLoader/native-code.cxx
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include osl/detail/android-bootstrap.h
-
-extern C
-__attribute__ ((visibility(default)))
-const lib_to_factory_mapping *
-lo_get_factory_map(void)
-{
-static lib_to_factory_mapping map[] = {
-LO_EXTENDED_CORE_FACTORY_MAP
-LO_BASE_CORE_FACTORY_MAP
-LO_CALC_CORE_FACTORY_MAP
-LO_DRAW_CORE_FACTORY_MAP
-LO_MATH_FACTORY_MAP
-LO_WRITER_FACTORY_MAP
-{ libprotocolhandlerlo.a, protocolhandler_component_getFactory },
-{ libsblo.a, sb_component_getFactory },
-{ NULL, NULL }
-};
-
-return map;
-}
-
-extern C
-__attribute__ ((visibility(default)))
-const lib_to_constructor_mapping *
-lo_get_constructor_map(void)
-{
-static lib_to_constructor_mapping map[] = {
-NON_APP_SPECIFIC_CONSTRUCTOR_MAP
-{ NULL, NULL }
-};
-
-return map;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/android/experimental/LibreOffice4Android/Makefile 
b/android/experimental/LibreOffice4Android/Makefile
index 9f8dcce..92f0668 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -12,6 +12,11 @@ APP_PACKAGE=org.libreoffice
 BOOTSTRAPDIR=../../Bootstrap
 include $(BOOTSTRAPDIR)/Makefile.shared
 
+native-code.cxx: $(SRCDIR)/solenv/bin/native-code.py
+   $ -f EXTENDED_CORE -f BASE_CORE -f CALC_CORE -f DRAW_CORE -f MATH -f 
WRITER \
+   -s dlgprov -s protocolhandler -s scriptframe -s sb -s 
stringresource -s vbaswobj -s vbaevents \
+$@
+
 copy-stuff:
 # Then assets. Let the directory structure under assets mimic
 # that under solver for now.
diff --git a/android/experimental/LibreOffice4Android/native-code.cxx 
b/android/experimental/LibreOffice4Android/native-code.cxx
deleted file mode 100644
index 44cb862..000
--- a/android/experimental/LibreOffice4Android/native-code.cxx
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include osl/detail/android-bootstrap.h
-
-extern C
-__attribute__ ((visibility(default)))
-const lib_to_factory_mapping *
-lo_get_factory_map(void)
-{
-static lib_to_factory_mapping map[] = {
-

Re: Request to modify Commit #7142 about CSV import

Hi Stephan,

On Thursday, 2013-12-19 22:25:26 +0100, Stephan van den Akker wrote:

 Enquoting values may be done by LO, but lots of third party programs do not.
 Dutch software often produces files with commas for decimal separators and
 other characters as field separators (e.g. semicolons).
 
 As stupid as this may seem, even software provided by the Dutch government
 (like http://car.infomil.nl) works like this.
 
 I'm afraid Calc will be rendered almost useless for Dutch users if un-enquoted
 commas are treated as field separators...

Sounds like a misunderstanding. Nothing changed in CSV import separator
handling, this was solely about a change that in the import dialog
preset checked the Comma as separator for files with extension .csv,
overriding the remembered import options. Which I reverted.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Support the FSFE, care about Free Software! https://fsfe.org/support/?erack


pgppjZY7cOwYn.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Request to modify Commit #7142 about CSV import

2013-12-20 Thread Stephan van den Akker

Hi Eike,

Thanks for the info. Using csv files in the Netherlands, with a mix of
computers and a mix of software using different locale settings to
write them, is a nightmare. The present csv handling in Calc is a
bright spot that I cherish and love.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: build error in libdbaselo.so

Hi Cor,

On Friday, 2013-12-20 08:49:40 +0100, Cor Nouws wrote:

 fresh pull  make clean last night
 [build LNK] Library/libdbaselo.so
 /home/cono/src/git/libo_core/workdir/CxxObject/framework/source/services/urltransformer.o:
 file not recognized: File truncated

Might be related to ccache if you have that enabled and interrupted the
last build at a very unfortunate time. If so then try the command

CCACHE_RECACHE=1 make 
/home/cono/src/git/libo_core/workdir/CxxObject/framework/source/services/urltransformer.o

which hopefully builds only that target, and then continue with a normal
make.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Support the FSFE, care about Free Software! https://fsfe.org/support/?erack


pgpqPYpZcTLWW.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: build error in libdbaselo.so

2013-12-20 Thread Cor Nouws

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Hi Eike,

Eike Rathke wrote (20-12-13 13:25)

 Might be related to ccache if you have that enabled and interrupted
 the last build at a very unfortunate time. If so then try the
 command

Sounds plausible - my whole OS did freeze when I was doing some greedy
tasks too fast ..

 CCACHE_RECACHE=1 make
 /home/cono/src/git/libo_core/workdir/CxxObject/framework/source/services/urltransformer.o

  which hopefully builds only that target, and then continue with a
 normal make.

Will try - thanks for your advise!

Cor

- -- 
 - Cor Nouws
 - http://nl.libreoffice.org
 - The Document Foundation Membership Committee Member
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.14 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQEcBAEBAgAGBQJStDpAAAoJEOSdc2WxNICm+YMH/Aj9DEiuYQFXQaEuiKap25OV
wnZajS730pQSBHgAKHF7pNs8hdNqBL75E/4TPtPNTPcUSGaeiomxvPrM3PvMJFyt
L9xqZBFpLaXG0Q4ETYhUu8jboqljbSOlChooF90MmwQxVUqqevJLq6SLPgLCeBuX
huzGA5t0KhILmh9yzHTGMJBV45XJzDey4hhi4Z8LFM3RxXYaIYgEYthbE2loDHhH
z6pnRxctPno2SO1ZRyIc3LmCYbrL4JBitV3F/VnIcFGiWMLtySxNa26M5k4AKsxh
BEGHm/FEvQL6N0TAtNOoSvG9/luRseWM0WYcLyYJVqZ8YnVahAbGBgSLXAnQH90=
=ySVE
-END PGP SIGNATURE-
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

 sc/uiconfig/scalc/ui/externaldata.ui |   20 
 1 file changed, 12 insertions(+), 8 deletions(-)

New commits:
commit 674aeac88ffa1840f2d6a7f33656193aaebc9a0c
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Dec 20 12:41:40 2013 +

Resolves: fdo#72682 text field doesn't horizontally expand

Change-Id: I3d12d0b376c9c0488d12df8f9d3fe76b1c00a437

diff --git a/sc/uiconfig/scalc/ui/externaldata.ui 
b/sc/uiconfig/scalc/ui/externaldata.ui
index 3ab0490..dfad80c 100644
--- a/sc/uiconfig/scalc/ui/externaldata.ui
+++ b/sc/uiconfig/scalc/ui/externaldata.ui
@@ -2,13 +2,6 @@
 interface
   !-- interface-requires gtk+ 3.0 --
   !-- interface-requires LibreOffice 1.0 --
-  object class=GtkAdjustment id=adjustment1
-property name=lower1/property
-property name=upper9/property
-property name=value60/property
-property name=step_increment1/property
-property name=page_increment10/property
-  /object
   object class=GtkDialog id=ExternalDataDialog
 property name=can_focusFalse/property
 property name=border_width6/property
@@ -79,24 +72,28 @@
   object class=GtkBox id=box1
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=hexpandTrue/property
 property name=orientationvertical/property
 property name=spacing12/property
 child
   object class=GtkFrame id=frame1
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=hexpandTrue/property
 property name=label_xalign0/property
 property name=shadow_typenone/property
 child
   object class=GtkAlignment id=alignment1
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=hexpandTrue/property
 property name=top_padding6/property
 property name=left_padding12/property
 child
   object class=GtkBox id=box2
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=hexpandTrue/property
 property name=orientationvertical/property
 property name=spacing6/property
 child
@@ -200,7 +197,7 @@
 property name=vexpandTrue/property
 property name=shadow_typein/property
 child
-  object class=GtkTreeView id=ranges
+  object class=GtkTreeView id=ranges:border
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=hexpandTrue/property
@@ -327,4 +324,11 @@
   action-widget response=0help/action-widget
 /action-widgets
   /object
+  object class=GtkAdjustment id=adjustment1
+property name=lower1/property
+property name=upper9/property
+property name=value60/property
+property name=step_increment1/property
+property name=page_increment10/property
+  /object
 /interface
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/uiconfig/scalc/ui/externaldata.ui |   20 
 1 file changed, 12 insertions(+), 8 deletions(-)

New commits:
commit c1e0e4364b9ca3e437e118cde91183271357f3c5
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Dec 20 12:41:40 2013 +

Resolves: fdo#72682 text field doesn't horizontally expand

Change-Id: I3d12d0b376c9c0488d12df8f9d3fe76b1c00a437
(cherry picked from commit 674aeac88ffa1840f2d6a7f33656193aaebc9a0c)

diff --git a/sc/uiconfig/scalc/ui/externaldata.ui 
b/sc/uiconfig/scalc/ui/externaldata.ui
index 3ab0490..dfad80c 100644
--- a/sc/uiconfig/scalc/ui/externaldata.ui
+++ b/sc/uiconfig/scalc/ui/externaldata.ui
@@ -2,13 +2,6 @@
 interface
   !-- interface-requires gtk+ 3.0 --
   !-- interface-requires LibreOffice 1.0 --
-  object class=GtkAdjustment id=adjustment1
-property name=lower1/property
-property name=upper9/property
-property name=value60/property
-property name=step_increment1/property
-property name=page_increment10/property
-  /object
   object class=GtkDialog id=ExternalDataDialog
 property name=can_focusFalse/property
 property name=border_width6/property
@@ -79,24 +72,28 @@
   object class=GtkBox id=box1
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=hexpandTrue/property
 property name=orientationvertical/property
 property name=spacing12/property
 child
   object class=GtkFrame id=frame1
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=hexpandTrue/property
 property name=label_xalign0/property
 property name=shadow_typenone/property
 child
   object class=GtkAlignment id=alignment1
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=hexpandTrue/property
 property name=top_padding6/property
 property name=left_padding12/property
 child
   object class=GtkBox id=box2
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=hexpandTrue/property
 property name=orientationvertical/property
 property name=spacing6/property
 child
@@ -200,7 +197,7 @@
 property name=vexpandTrue/property
 property name=shadow_typein/property
 child
-  object class=GtkTreeView id=ranges
+  object class=GtkTreeView id=ranges:border
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=hexpandTrue/property
@@ -327,4 +324,11 @@
   action-widget response=0help/action-widget
 /action-widgets
   /object
+  object class=GtkAdjustment id=adjustment1
+property name=lower1/property
+property name=upper9/property
+property name=value60/property
+property name=step_increment1/property
+property name=page_increment10/property
+  /object
 /interface
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2f/7c1bf53f4ba682c305b89d7fa53b87d8e77506

 2f/7c1bf53f4ba682c305b89d7fa53b87d8e77506 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0bc3f421997ff8fd6950a9a57369d2d94aaf8816
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Dec 20 12:43:13 2013 +

Notes added by 'git notes add'

diff --git a/2f/7c1bf53f4ba682c305b89d7fa53b87d8e77506 
b/2f/7c1bf53f4ba682c305b89d7fa53b87d8e77506
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/2f/7c1bf53f4ba682c305b89d7fa53b87d8e77506
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: l10n process, en_US version, Help files

2013-12-20 Thread Sophie

Hi Caolán,
Le 18/12/2013 11:19, Caolán McNamara a écrit :
[...]

 
 * About the help files
 - I always wonder why there is a Help button on a new dialog when no
 help file is appended ;)
 
 One thing that we could with the new .ui file format is to confirm if
 each dialog actually has a help entry for it. There is an easy hack at
 https://bugs.freedesktop.org/show_bug.cgi?id=67350 to extract out the
 new-format helpids from the help and determine if they actually exist.
 That would weed out typos where the help gets detached from the thing it
 documents.
 
 Similarly someone could script if each new-format dialog has a help
 entry and make a list of stuff that is missing help and turn those into
 a list of tasks to document those things.
 
 Another thing that could be automated is to generate a skeleton help
 page from a new-format dialog. i.e. generate the help ids bookmarks for
 the interactive widgets, buttons, checkboxes, etc. and have fill-me-in
 headings and bodytext.

Thank you very much for your suggestions. Would your two last
suggestions fall also under easyhacks or is it something more
complicated to code?

Kind regards
Sophie

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

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

 sw/source/ui/misc/swruler.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 0eb1ef39084a978e8c2bec977ebabf6708f0c073
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Dec 20 14:56:33 2013 +0200

Prevent occasional crash

I came across the crash by accident when checking how it works to have
multiple windows showing the same document. Pasting in lots of text
and then quickly telling LO to exit with Cmd-Q caused a crash here as
GetPostItMgr() returned NULL.

Change-Id: Ib9e636df0832a679a1d81fa3856ea0a7105a69c3

diff --git a/sw/source/ui/misc/swruler.cxx b/sw/source/ui/misc/swruler.cxx
index fa396d0..b1035c9 100644
--- a/sw/source/ui/misc/swruler.cxx
+++ b/sw/source/ui/misc/swruler.cxx
@@ -56,7 +56,8 @@ void SwCommentRuler::Paint( const Rectangle rRect )
 {
 SvxRuler::Paint( rRect );
 // Don't draw if there is not any note
-if ( mpViewShell-GetPostItMgr()-HasNotes() )
+if ( mpViewShell-GetPostItMgr()
+  mpViewShell-GetPostItMgr()-HasNotes() )
 DrawCommentControl();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sw/source/filter/ww8/docxattributeoutput.cxx |   41 ++-
 1 file changed, 28 insertions(+), 13 deletions(-)

New commits:
commit a130de7e00bb426b15ec3b0ffc6bffc652d174ab
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Fri Dec 20 12:50:45 2013 +0100

sw: drawingml export of text frame back color transparency

CppunitTest_sw_ooxmlexport's testFdo66688 is a reproducer for this
problem.

Change-Id: Idbde9c0f8581652300ae29adcd27b83469f38b03

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index ce985b8..f16d047 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -5700,25 +5700,35 @@ void DocxAttributeOutput::FormatAnchor( const 
SwFmtAnchor )
 // Fly frames: anchors here aren't matching the anchors in docx
 }
 
+boost::optionalsal_Int32 lcl_getDmlAlpha(const SvxBrushItem rBrush)
+{
+boost::optionalsal_Int32 oRet;
+sal_Int32 nTransparency = rBrush.GetColor().GetTransparency();
+if (nTransparency)
+{
+// Convert transparency to percent
+sal_Int8 nTransparencyPercent = 
SvxBrushItem::TransparencyToPercent(nTransparency);
+
+// Calculate alpha value
+// Consider oox/source/drawingml/color.cxx : getTransparency() 
function.
+sal_Int32 nAlpha = (::oox::drawingml::MAX_PERCENT - ( 
::oox::drawingml::PER_PERCENT * nTransparencyPercent ) );
+oRet = nAlpha;
+}
+return oRet;
+}
+
 void DocxAttributeOutput::FormatBackground( const SvxBrushItem rBrush )
 {
 OString sColor = msfilter::util::ConvertColor( rBrush.GetColor( ) );
+boost::optionalsal_Int32 oAlpha = lcl_getDmlAlpha(rBrush);
 if (m_bTextFrameSyntax)
 {
 // Handle 'Opacity'
-sal_Int32 nTransparency = rBrush.GetColor().GetTransparency();
-if (nTransparency)
+if (oAlpha)
 {
-// Convert transparency to percent
-sal_Int8 nTransparencyPercent = 
SvxBrushItem::TransparencyToPercent(nTransparency);
-
-// Calculate alpha value
-// Consider oox/source/drawingml/color.cxx : getTransparency() 
function.
-sal_Int32 nAlpha = (::oox::drawingml::MAX_PERCENT - ( 
::oox::drawingml::PER_PERCENT * nTransparencyPercent ) );
-
 // Calculate opacity value
 // Consider oox/source/vml/vmlformatting.cxx : decodeColor() 
function.
-double fOpacity = (double)nAlpha * 65535 / 
::oox::drawingml::MAX_PERCENT;
+double fOpacity = (double)(*oAlpha) * 65535 / 
::oox::drawingml::MAX_PERCENT;
 OUString sOpacity = OUString::number(fOpacity);
 
 if ( !m_pFlyFillAttrList )
@@ -5732,9 +5742,14 @@ void DocxAttributeOutput::FormatBackground( const 
SvxBrushItem rBrush )
 else if (m_bDMLTextFrameSyntax)
 {
 m_pSerializer-startElementNS(XML_a, XML_solidFill, FSEND);
-m_pSerializer-singleElementNS(XML_a, XML_srgbClr,
-   XML_val, sColor,
-   FSEND);
+m_pSerializer-startElementNS(XML_a, XML_srgbClr,
+  XML_val, sColor,
+  FSEND);
+if (oAlpha)
+m_pSerializer-singleElementNS(XML_a, XML_alpha,
+   XML_val, OString::number(*oAlpha),
+   FSEND);
+m_pSerializer-endElementNS(XML_a, XML_srgbClr);
 m_pSerializer-endElementNS(XML_a, XML_solidFill);
 }
 else if ( !m_rExport.bOutPageDescs )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

odb ODF standard conformance [was: minutes of ESC call ...]

2013-12-20 Thread Lionel Elie Mamane

On Thu, Dec 19, 2013 at 08:24:29PM +, Michael Meeks wrote:

* Crashtest update (Markus)
+ cf. http://dev-builds.libreoffice.org/crashtest/
new crash testing result is available (cf. the date git hash)
All files tested, and the results are complete for the 1st time.
and that all odb files are not valid according to the validator
+ need to look at the standard (Lionel)
+ presumably some silly error ...

Here are the main classes of low hanging fruit conformance errors I
see:

1) xlink:href without xlink:type

Easy to fix if (as I assume) I can always put simple in these
places. I have a patch sitting in my tree to do that.

2) manifest:manifest without version attribute: I have no clue what
version I should put there. Any hint?

3) ODF mimetype 'application/vnd.oasis.opendocument.base' is invalid

Well,

http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part1.html#__RefHeading__1420388_253892949
lists this as the recommended mimetype but that the
RFC4288-registration is in progress. Shouldn't we rather move
forward on the registration... which has been stalled... why?

I need help on these:

1) fdo36288-2.odb/forms/Obj42/content.xml[2,17145]: Error: attribute
xlink:href has a bad value: .uno:FormController/saveRecord does
not satisfy the anyURI type

What is the right way to put a .uno URI?

2) ooo103006-1.odb/reports/Obj131/content.xml[2,6115]: Error: element
form:hidden is missing id attribute

This one probably just needs an ID generated. Shall we just call
something like BASE64ENCODE(RANDOM(give me 9 bytes))? Or is there a
more structured system in LibreOffice?

These need some real investigation:

1) fdo40381-1.odb/content.xml[2,3672]: Error: uncompleted content model.
expecting: column

2)
srv/crashtestdata/current/home/buildslave/source/bugdocs2/odb/fdo36288-2.odb/content.xml[2,3901]:
Error: unexpected attribute db:type-name

3) ooo103006-1.odb/content.xml[2,42566]: Error: element db:order-statement
was found where no element may occur

4) ooo103006-1.odb/content.xml[2,42818]: Error: unexpected attribute
db:help-message

5) ooo103006-1.odb/forms/Obj21/content.xml[2,121903]: Error: control149 is
referenced by an IDREF, but not defined.

I doubt that these actually come from base-specific code, but who
knows:

1) forms/Obj11/styles.xml: Error: unexpected attribute
style:layout-grid-snap-to-characters

2) fdo36288-2.odb/content.xml[2,2887]: Error: tag name
db:font-charset is not allowed. Possible tag names are:
character-set,table-settings

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

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - sc/source sd/source toolkit/inc toolkit/source

 sc/source/ui/unoobj/viewuno.cxx|2 ++
 sd/source/ui/unoidl/DrawController.cxx |2 +-
 toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx |3 +--
 toolkit/source/awt/vclxtabpagecontainer.cxx|1 +
 toolkit/source/controls/controlmodelcontainerbase.cxx  |2 +-
 toolkit/source/controls/tabpagemodel.cxx   |4 
 6 files changed, 6 insertions(+), 8 deletions(-)

New commits:
commit 5dfcb178f89532a92b4565739d3445a56abfd095
Author: JÃ¼rgen Schmidt j...@apache.org
Date:   Fri Dec 20 13:56:32 2013 +

#91439# apply patch to copy key modifiers as well

Patch By: hanya
Review By: jsc

diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index d3f1a7b..c8ede08 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -1285,6 +1285,7 @@ sal_Bool ScTabViewObj::MousePressed( const 
awt::MouseEvent e )
 aMouseEvent.ClickCount = e.ClickCount;
 aMouseEvent.PopupTrigger = e.PopupTrigger;
 aMouseEvent.Target = xTarget;
+aMouseEvent.Modifiers = e.Modifiers;
 
 for ( sal_uInt16 n=0; naMouseClickHandlers.Count(); n++ )
 {
@@ -1379,6 +1380,7 @@ sal_Bool ScTabViewObj::MouseReleased( const 
awt::MouseEvent e )
 aMouseEvent.ClickCount = e.ClickCount;
 aMouseEvent.PopupTrigger = e.PopupTrigger;
 aMouseEvent.Target = xTarget;
+aMouseEvent.Modifiers = e.Modifiers;
 
 for ( sal_uInt16 n=0; naMouseClickHandlers.Count(); n++ )
 {
commit 1831b6c95e6137432f64729a270e53fc39e46217
Author: JÃ¼rgen Schmidt j...@apache.org
Date:   Fri Dec 20 13:36:19 2013 +

#123783# apply patch to correct type of ActiveLayer property

Patch By: hanya
Review By: jsc

diff --git a/sd/source/ui/unoidl/DrawController.cxx 
b/sd/source/ui/unoidl/DrawController.cxx
index 4c5fda2..a9656a9 100644
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -762,7 +762,7 @@ void DrawController::FillPropertyTable (
 rProperties.push_back(
 beans::Property( OUString( RTL_CONSTASCII_USTRINGPARAM(ActiveLayer) 
),
 PROPERTY_ACTIVE_LAYER,
-::getCppuBooleanType(),
+::getCppuType((const Reference drawing::XLayer  *)0),
 beans::PropertyAttribute::BOUND ));
 rProperties.push_back(
 beans::Property( OUString( RTL_CONSTASCII_USTRINGPARAM(ZoomValue) ),
commit aa098b9e612b30a916cd4ce002133d499d7f711a
Author: JÃ¼rgen Schmidt j...@apache.org
Date:   Fri Dec 20 12:40:17 2013 +

#120358# apply patch to support properties from tab model

Patch By: hanya
Review By: jsc

diff --git a/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx 
b/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx
index 6f46416..e25b48a 100644
--- a/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx
+++ b/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx
@@ -85,8 +85,7 @@ protected:
 AllGroups   maGroups;
 sal_BoolmbGroupsUpToDate;
 
-boolm_bEnabled;
-::rtl::OUString m_sTitle;
+sal_Boolm_bEnabled;
 ::rtl::OUString m_sImageURL;
 ::rtl::OUString m_sTooltip;
 sal_Int16   m_nTabPageId;
diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx 
b/toolkit/source/awt/vclxtabpagecontainer.cxx
index c8ee1df..e179316 100644
--- a/toolkit/source/awt/vclxtabpagecontainer.cxx
+++ b/toolkit/source/awt/vclxtabpagecontainer.cxx
@@ -208,6 +208,7 @@ void SAL_CALL VCLXTabPageContainer::elementInserted( const 
::com::sun::star::con
 pTabCtrl-SetHelpText(nPageID,xP-getToolTip());
 
pTabCtrl-SetPageImage(nPageID,TkResMgr::getImageFromURL(xP-getImageURL()));
 pTabCtrl-SelectTabPage(nPageID);
+pTabCtrl-EnablePage(nPageID,xP-getEnabled());
 m_aTabPages.push_back(xTabPage);
 }
 }
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx 
b/toolkit/source/controls/controlmodelcontainerbase.cxx
index 496a707..7ed16d5 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -221,6 +221,7 @@ ControlModelContainerBase::ControlModelContainerBase( const 
Reference XMultiSer
 ,maContainerListeners( *this )
 ,maChangeListeners ( GetMutex() )
 ,mbGroupsUpToDate( sal_False )
+,m_bEnabled( sal_True )
 {
 }
 
@@ -765,7 +766,6 @@ void SAL_CALL ControlModelContainerBase::setEnabled( 
::sal_Bool _enabled ) throw
 ::rtl::OUString sTitle;
 xThis-getPropertyValue(GetPropertyName(BASEPROPERTY_TITLE)) = sTitle;
 return sTitle;
-//return m_sTitle;
 }
 void SAL_CALL

Re: odb ODF standard conformance [was: minutes of ESC call ...]

Hi Lionel,

On Fri, Dec 20, 2013 at 02:40:18PM +0100, Lionel Elie Mamane lio...@mamane.lu 
wrote:
 2) ooo103006-1.odb/reports/Obj131/content.xml[2,6115]:  Error: element
form:hidden is missing id attribute
 
This one probably just needs an ID generated. Shall we just call
something like BASE64ENCODE(RANDOM(give me 9 bytes))? Or is there a
more structured system in LibreOffice?

Random is probably the worst method you can think about. Can't you just
use an integer id, starting from 0? Assuming that there is some exporter
class where you can store this id, so the counter is reset back to 0
each time you start an export. At least that's what we do for e.g.
pictures in the DOCX export.

Miklos


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

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

 vcl/source/window/toolbox2.cxx |   12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 3843a568fd11ed0f2dac20d6c5e4f9feb7232f2e
Author: Jan Holesovsky ke...@collabora.com
Date:   Fri Dec 20 15:13:29 2013 +0100

hidpi: Image is reference counted.

No need no schuffle with pointers to avoid copying :-)

Change-Id: I62757214db65af856e0c79f662d15938c0e9a675

diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index c4f06dd..b11a918 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -1343,18 +1343,17 @@ void* ToolBox::GetItemData( sal_uInt16 nItemId ) const
 
 // ---
 
-void ToolBox::SetItemImage( sal_uInt16 nItemId, const Image rInputImage )
+void ToolBox::SetItemImage( sal_uInt16 nItemId, const Image rImage )
 {
 sal_uInt16 nPos = GetItemPos( nItemId );
 
 if ( nPos != TOOLBOX_ITEM_NOTFOUND )
 {
-const Image* pImage = rInputImage; // Use the pointer to avoid 
unnecessary copying
-Image aImage; // But we still need to keep the modified image alive if 
created.
+Image aImage(rImage);
 
 if ( GetDPIScaleFactor()  1)
 {
-BitmapEx aBitmap = rInputImage.GetBitmapEx();
+BitmapEx aBitmap(aImage.GetBitmapEx());
 
 // Some code calls this twice, so add a sanity check
 // FIXME find out what that code is  fix accordingly
@@ -1362,7 +1361,6 @@ void ToolBox::SetItemImage( sal_uInt16 nItemId, const 
Image rInputImage )
 {
 aBitmap.Scale(GetDPIScaleFactor(), GetDPIScaleFactor());
 aImage = Image(aBitmap);
-pImage = aImage;
 }
 }
 
@@ -1371,14 +1369,14 @@ void ToolBox::SetItemImage( sal_uInt16 nItemId, const 
Image rInputImage )
 if ( !mbCalc )
 {
 Size aOldSize = pItem-maImage.GetSizePixel();
-pItem-maImage = *pImage;
+pItem-maImage = aImage;
 if ( aOldSize != pItem-maImage.GetSizePixel() )
 ImplInvalidate( sal_True );
 else
 ImplUpdateItem( nPos );
 }
 else
-pItem-maImage = *pImage;
+pItem-maImage = aImage;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 4 commits - cui/source include/vcl sd/source sd/uiconfig svx/source sw/source vcl/source

 cui/source/tabpages/align.cxx|   12 +
 cui/source/tabpages/border.cxx   |   22 +-
 include/vcl/outdev.hxx   |2 
 sd/source/ui/sidebar/LayoutMenu.cxx  |3 +
 sd/uiconfig/sdraw/statusbar/statusbar.xml|2 
 sd/uiconfig/simpress/statusbar/statusbar.xml |2 
 svx/source/dialog/dialcontrol.cxx|5 ++
 svx/source/stbctrls/modctrl.cxx  |   16 +--
 svx/source/stbctrls/pszctrl.cxx  |   11 +
 svx/source/stbctrls/selctrl.cxx  |7 +++
 svx/source/stbctrls/xmlsecctrl.cxx   |   25 ++--
 svx/source/stbctrls/zoomsliderctrl.cxx   |   39 +-
 svx/source/tbxctrls/layctrl.cxx  |   30 --
 svx/source/tbxctrls/tbcontrl.src |2 
 svx/source/tbxctrls/tbunocontroller.cxx  |2 
 sw/source/ui/utlui/content.cxx   |   16 +++
 sw/source/ui/utlui/viewlayoutctrl.cxx|   45 +
 vcl/source/gdi/image.cxx |9 +---
 vcl/source/gdi/outdev3.cxx   |2 
 vcl/source/window/msgbox.cxx |   15 ---
 vcl/source/window/toolbox.cxx|   56 +--
 vcl/source/window/toolbox2.cxx   |   24 ++-
 22 files changed, 268 insertions(+), 79 deletions(-)

New commits:
commit 56d1b1cb7b0e1db8b4eee8e7f53814b107f9b80c
Author: Jan Holesovsky ke...@collabora.com
Date:   Fri Dec 20 14:42:44 2013 +0100

hidpi: Add a FIXME.

Change-Id: Ia89679c832d98b5b46eeb088ed8ae4d66575e6d4

diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index f33a129..c4f06dd 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -1356,7 +1356,8 @@ void ToolBox::SetItemImage( sal_uInt16 nItemId, const 
Image rInputImage )
 {
 BitmapEx aBitmap = rInputImage.GetBitmapEx();
 
-//Some code calls this twice, so add a sanity check
+// Some code calls this twice, so add a sanity check
+// FIXME find out what that code is  fix accordingly
 if (aBitmap.GetSizePixel().Width()  32)
 {
 aBitmap.Scale(GetDPIScaleFactor(), GetDPIScaleFactor());
commit e07097cce36f1220f5574a80dc22eeabb3005261
Author: Jan Holesovsky ke...@collabora.com
Date:   Fri Dec 20 14:39:02 2013 +0100

hidpi: Use the default scaling algorithm.

We are not on _that_ time critical path when setting up images for the UI, 
so
let's have at least some quality there :-)

Change-Id: I0a82106b0d60ac6a543d5e55c48fc86b6d5f60b1

diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 5ba830a..2418ff5 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -329,7 +329,7 @@ void AlignmentTabPage::InitVsRefEgde()
 {
 OUString rImageName = aImageList.GetImageName(i);
 BitmapEx b = aImageList.GetImage(rImageName).GetBitmapEx();
-b.Scale(GetDPIScaleFactor(), GetDPIScaleFactor(), BMP_SCALE_FAST);
+b.Scale(GetDPIScaleFactor(), GetDPIScaleFactor());
 aImageList.ReplaceImage(rImageName, Image(b));
 }
 }
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 0073a9e..31bb802 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -134,7 +134,7 @@ SvxBorderTabPage::SvxBorderTabPage(Window* pParent, const 
SfxItemSet rCoreAttrs
 {
 OUString rImageName = aBorderImgLst.GetImageName(i);
 BitmapEx b = aBorderImgLst.GetImage(rImageName).GetBitmapEx();
-b.Scale(GetDPIScaleFactor(), GetDPIScaleFactor(), BMP_SCALE_FAST);
+b.Scale(GetDPIScaleFactor(), GetDPIScaleFactor());
 aBorderImgLst.ReplaceImage(rImageName, Image(b));
 }
 
@@ -142,7 +142,7 @@ SvxBorderTabPage::SvxBorderTabPage(Window* pParent, const 
SfxItemSet rCoreAttrs
 {
 OUString rImageName = aShadowImgLst.GetImageName(i);
 BitmapEx b = aShadowImgLst.GetImage(rImageName).GetBitmapEx();
-b.Scale(GetDPIScaleFactor(), GetDPIScaleFactor(), BMP_SCALE_FAST);
+b.Scale(GetDPIScaleFactor(), GetDPIScaleFactor());
 aShadowImgLst.ReplaceImage(rImageName, Image(b));
 }
 }
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx 
b/sd/source/ui/sidebar/LayoutMenu.cxx
index 5abb05c..55a9157 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -651,7 +651,7 @@ void LayoutMenu::Fill (void)
 BitmapEx aBmp(SdResId(pInfo-mnBmpResId));
 
 if (GetDPIScaleFactor()  1)
-aBmp.Scale(GetDPIScaleFactor(), GetDPIScaleFactor(), 
BMP_SCALE_FAST);
+aBmp.Scale(GetDPIScaleFactor(), GetDPIScaleFactor());
 
 if (bRightToLeft  (WritingMode_TB_RL !=

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

2013-12-20 Thread Fridrich Štrba

 writerperfect/source/common/WPXSvStream.cxx |  157 ++--
 1 file changed, 125 insertions(+), 32 deletions(-)

New commits:
commit c56c2e28ff4252aa858826416a8a57cb8c2bf100
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Fri Dec 20 14:49:06 2013 +0100

Buffered WPXSvInputStream

Change-Id: I8bb2632cb018093d02e21090e77bb48364f99268
Reviewed-on: https://gerrit.libreoffice.org/7146
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/writerperfect/source/common/WPXSvStream.cxx 
b/writerperfect/source/common/WPXSvStream.cxx
index dd35311..c803632 100644
--- a/writerperfect/source/common/WPXSvStream.cxx
+++ b/writerperfect/source/common/WPXSvStream.cxx
@@ -37,7 +37,7 @@ typedef struct
 SotStorageStreamRef ref;
 } SotStorageStreamRefWrapper;
 
-class WPXSvInputStreamImpl : public WPXInputStream
+class WPXSvInputStreamImpl
 {
 public :
 WPXSvInputStreamImpl( ::com::sun::star::uno::Reference
@@ -48,27 +48,35 @@ public :
 WPXInputStream * getDocumentOLEStream(const char *name);
 
 const unsigned char *read(unsigned long numBytes, unsigned long 
numBytesRead);
-int seek(long offset, WPX_SEEK_TYPE seekType);
+int seek(long offset);
 long tell();
 bool atEOS();
+void invalidateReadBuffer();
 private:
 ::std::vector SotStorageRefWrapper  mxChildrenStorages;
 ::std::vector SotStorageStreamRefWrapper  mxChildrenStreams;
 ::com::sun::star::uno::Reference
-::com::sun::star::io::XInputStream  mxStream;
+::com::sun::star::io::XInputStream  mxStream;
 ::com::sun::star::uno::Reference
-::com::sun::star::io::XSeekable  mxSeekable;
+::com::sun::star::io::XSeekable  mxSeekable;
 ::com::sun::star::uno::Sequence sal_Int8  maData;
+public:
 sal_Int64 mnLength;
+unsigned char *mpReadBuffer;
+unsigned long mnReadBufferLength;
+unsigned long mnReadBufferPos;
 };
 
 WPXSvInputStreamImpl::WPXSvInputStreamImpl( Reference XInputStream  xStream 
) :
-WPXInputStream(),
 mxChildrenStorages(),
 mxChildrenStreams(),
 mxStream(xStream),
 mxSeekable(xStream, UNO_QUERY),
-maData(0)
+maData(0),
+mnLength(0),
+mpReadBuffer(0),
+mnReadBufferLength(0),
+mnReadBufferPos(0)
 {
 if (!xStream.is() || !mxStream.is())
 mnLength = 0;
@@ -93,6 +101,8 @@ WPXSvInputStreamImpl::WPXSvInputStreamImpl( Reference 
XInputStream  xStream )
 
 WPXSvInputStreamImpl::~WPXSvInputStreamImpl()
 {
+if (mpReadBuffer)
+delete [] mpReadBuffer;
 }
 
 const unsigned char *WPXSvInputStreamImpl::read(unsigned long numBytes, 
unsigned long numBytesRead)
@@ -122,7 +132,7 @@ long WPXSvInputStreamImpl::tell()
 }
 }
 
-int WPXSvInputStreamImpl::seek(long offset, WPX_SEEK_TYPE seekType)
+int WPXSvInputStreamImpl::seek(long offset)
 {
 if ((mnLength == 0) || !mxStream.is() || !mxSeekable.is())
 return -1;
@@ -131,28 +141,10 @@ int WPXSvInputStreamImpl::seek(long offset, WPX_SEEK_TYPE 
seekType)
 if ((tmpPosition  0) || (tmpPosition  
(std::numeric_limitslong::max)()))
 return -1;
 
-sal_Int64 tmpOffset = offset;
-if (seekType == WPX_SEEK_CUR)
-tmpOffset += tmpPosition;
-if (seekType == WPX_SEEK_END)
-tmpOffset += mnLength;
-
-int retVal = 0;
-if (tmpOffset  0)
-{
-tmpOffset = 0;
-retVal = -1;
-}
-if (tmpOffset  mnLength)
-{
-tmpOffset = mnLength;
-retVal = -1;
-}
-
 try
 {
-mxSeekable-seek(tmpOffset);
-return retVal;
+mxSeekable-seek(offset);
+return 0;
 }
 catch (...)
 {
@@ -255,6 +247,18 @@ WPXInputStream 
*WPXSvInputStreamImpl::getDocumentOLEStream(const char *name)
 }
 
 
+void WPXSvInputStreamImpl::invalidateReadBuffer()
+{
+if (mpReadBuffer)
+{
+seek((long) tell() + (long)mnReadBufferPos - (long)mnReadBufferLength);
+delete [] mpReadBuffer;
+mpReadBuffer = 0;
+mnReadBufferPos = 0;
+mnReadBufferLength = 0;
+}
+}
+
 WPXSvInputStream::WPXSvInputStream( Reference XInputStream  xStream ) :
 mpImpl(new WPXSvInputStreamImpl(xStream))
 {
@@ -262,36 +266,125 @@ WPXSvInputStream::WPXSvInputStream( Reference 
XInputStream  xStream ) :
 
 WPXSvInputStream::~WPXSvInputStream()
 {
-   delete mpImpl;
+   if (mpImpl)
+   delete mpImpl;
 }
 
+#define BUFFER_MAX 65536
+
 const unsigned char *WPXSvInputStream::read(unsigned long numBytes, unsigned 
long numBytesRead)
 {
-return mpImpl-read(numBytes, numBytesRead);
+numBytesRead = 0;
+
+if (numBytes == 0 || numBytes  (std::numeric_limitsunsigned 
long::max)()/2)
+return 0;
+
+if (mpImpl-mpReadBuffer)
+{
+if ((mpImpl-mnReadBufferPos + numBytes  mpImpl-mnReadBufferPos)  
(mpImpl-mnReadBufferPos + numBytes = mpImpl-mnReadBufferLength))
+{
+const unsigned char *pTmp = mpImpl-mpReadBuffer +

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

 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |3 +++
 sw/source/filter/ww8/docxattributeoutput.cxx |   14 --
 2 files changed, 15 insertions(+), 2 deletions(-)

New commits:
commit 377ec698afc98a9a098b456f4ae3c694498df6a2
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Fri Dec 20 15:24:30 2013 +0100

CppunitTest_sw_ooxmlexport: register wps, wp and a namespaces

This are all required to be able to assert the drawingML equivalent of
VML XPath expressions.

Change-Id: I79460d6ae7448120f8b9c27acdba52d33ff52a5a

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index bd099be..fce4547 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -135,6 +135,9 @@ xmlNodeSetPtr Test::getXPathNode(xmlDocPtr pXmlDoc, const 
OString rXPath)
 xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST(w), 
BAD_CAST(http://schemas.openxmlformats.org/wordprocessingml/2006/main;));
 xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST(v), 
BAD_CAST(urn:schemas-microsoft-com:vml));
 xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST(mc), 
BAD_CAST(http://schemas.openxmlformats.org/markup-compatibility/2006;));
+xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST(wps), 
BAD_CAST(http://schemas.microsoft.com/office/word/2010/wordprocessingShape;));
+xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST(wp), 
BAD_CAST(http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing;));
+xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST(a), 
BAD_CAST(http://schemas.openxmlformats.org/drawingml/2006/main;));
 xmlXPathObjectPtr pXmlXpathObj = 
xmlXPathEvalExpression(BAD_CAST(rXPath.getStr()), pXmlXpathCtx);
 return pXmlXpathObj-nodesetval;
 }
commit b810e510f15b95ea64c52ae1eec2212280aef678
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Fri Dec 20 15:02:51 2013 +0100

sw: drawingml export of text frame btLr text direction

CppunitTest_sw_ooxmlexport's testFdo69636 is a reproducer for this problem.

Change-Id: Ibfd2f9388c22436d5677380a22184a2970b8e7be

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index f16d047..c8aa7a0 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -311,8 +311,11 @@ public:
 };
 
 // Undo the text direction mangling done by the frame btLr handler in 
writerfilter::dmapper::DomainMapper::lcl_startCharacterGroup()
-bool lcl_checkFrameBtlr(SwNode* pStartNode, sax_fastparser::FastAttributeList* 
pTextboxAttrList)
+bool lcl_checkFrameBtlr(SwNode* pStartNode, sax_fastparser::FastAttributeList* 
pTextboxAttrList = 0, sax_fastparser::FastAttributeList* pBodyPrAttrList = 0)
 {
+// The intended usage is to pass either a valid VML or DML attribute list.
+assert(pTextboxAttrList || pBodyPrAttrList);
+
 if (!pStartNode-IsTxtNode())
 return false;
 
@@ -345,7 +348,10 @@ bool lcl_checkFrameBtlr(SwNode* pStartNode, 
sax_fastparser::FastAttributeList* p
 const SvxCharRotateItem rCharRotate = static_castconst 
SvxCharRotateItem(*pItem);
 if (rCharRotate.GetValue() == 900)
 {
-pTextboxAttrList-add(XML_style, 
mso-layout-flow-alt:bottom-to-top);
+if (pTextboxAttrList)
+pTextboxAttrList-add(XML_style, 
mso-layout-flow-alt:bottom-to-top);
+else
+pBodyPrAttrList-add(XML_vert, vert270);
 return true;
 }
 }
@@ -471,7 +477,11 @@ void DocxAttributeOutput::WriteDMLTextFrame(sw::Frame* 
pParentFrame)
 m_rExport.mpParentFrame = NULL;
 m_pSerializer-startElementNS( XML_wps, XML_txbx, FSEND );
 m_pSerializer-startElementNS( XML_w, XML_txbxContent, FSEND );
+
+m_bFrameBtLr = lcl_checkFrameBtlr(m_rExport.pDoc-GetNodes()[nStt], 0, 
m_pBodyPrAttrList);
 m_rExport.WriteText( );
+m_bFrameBtLr = false;
+
 m_pSerializer-endElementNS( XML_w, XML_txbxContent );
 m_pSerializer-endElementNS( XML_wps, XML_txbx );
 XFastAttributeListRef xBodyPrAttrList(m_pBodyPrAttrList);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: odb ODF standard conformance [was: minutes of ESC call ...]

2013-12-20 Thread Lionel Elie Mamane

On Fri, Dec 20, 2013 at 03:09:04PM +0100, Miklos Vajna wrote:

 On Fri, Dec 20, 2013 at 02:40:18PM +0100, Lionel Elie Mamane 
 lio...@mamane.lu wrote:

 2) ooo103006-1.odb/reports/Obj131/content.xml[2,6115]:  Error: element
form:hidden is missing id attribute

This one probably just needs an ID generated. Shall we just call
something like BASE64ENCODE(RANDOM(give me 9 bytes))? Or is there a
more structured system in LibreOffice?

 Random is probably the worst method you can think about.

Why? What properties do you want from these IDs? Only that they are
unique within the XML document, right?

 Can't you just use an integer id, starting from 0?

This assumes a per-document global state counter to remember the
last used ID... Doable.

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

[Bug 65675] LibreOffice 4.2 most annoying bugs

2013-12-20 Thread bugzilla-daemon

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

Joel Madero jmadero@gmail.com changed:

   What|Removed |Added

 Depends on||72776

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

[Libreoffice-commits] core.git: ios/iosremote

2013-12-20 Thread Andras Timar

 ios/iosremote/TestFlightSDK1.2.6/libTestFlight.a |binary
 1 file changed

New commits:
commit 5bf9565fb731bd685c563f643ca8474289bf4f88
Author: Andras Timar andras.ti...@collabora.com
Date:   Fri Dec 20 16:17:33 2013 +0100

restore this binary file

Change-Id: I6e0d16fc260e609f1103947afb03c1640dc1a908

diff --git a/ios/iosremote/TestFlightSDK1.2.6/libTestFlight.a 
b/ios/iosremote/TestFlightSDK1.2.6/libTestFlight.a
index 74e7e6b..bc045a9 100644
Binary files a/ios/iosremote/TestFlightSDK1.2.6/libTestFlight.a and 
b/ios/iosremote/TestFlightSDK1.2.6/libTestFlight.a differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65675] LibreOffice 4.2 most annoying bugs

2013-12-20 Thread bugzilla-daemon

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

--- Comment #40 from Joel Madero jmadero@gmail.com ---
Nominated bug 72776 - appears like we have a new chart feature coming through
(circles of some kind) but it's quite broken. Doesn't work at all in 4.1, in
4.2 and 4.2 it's just broken and shows incorrect charts + missing data

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

Re: LibreOffice Gerrit News for core on 2013-12-09

2013-12-20 Thread bjoern

On Tue, Dec 10, 2013 at 04:40:34PM +0100, Florian Effenberger wrote:
 sure, no worries - I think David or Norbert can add new users to the
 machine, at least they regularly do. :)
 
 What we need at least is a SSH key.

AFAIK Mats accounts are set up, but it seems we never told him about it.

@David, @Norbert: Could you please complete onboarding properly (telling about
the account being setup to the new owner is the minimum, but it might make
sense to give at least some initial orientation too.)

Best,

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - aa/098b9e612b30a916cd4ce002133d499d7f711a

 aa/098b9e612b30a916cd4ce002133d499d7f711a |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 135617310c1a24aa5b290736ab0f0bf5ab0213d4
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Dec 20 15:26:27 2013 +

Notes added by 'git notes add'

diff --git a/aa/098b9e612b30a916cd4ce002133d499d7f711a 
b/aa/098b9e612b30a916cd4ce002133d499d7f711a
new file mode 100644
index 000..a868c4f
--- /dev/null
+++ b/aa/098b9e612b30a916cd4ce002133d499d7f711a
@@ -0,0 +1 @@
+merged as: 1c80f3ab5c6dde9ff9399885390d4e6d9013be57
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 include/toolkit/controls/controlmodelcontainerbase.hxx |5 ++---
 toolkit/source/awt/vclxtabpagecontainer.cxx|1 +
 toolkit/source/controls/controlmodelcontainerbase.cxx  |2 +-
 toolkit/source/controls/tabpagemodel.cxx   |4 
 4 files changed, 4 insertions(+), 8 deletions(-)

New commits:
commit 1c80f3ab5c6dde9ff9399885390d4e6d9013be57
Author: JÃ¼rgen Schmidt j...@apache.org
Date:   Fri Dec 20 12:40:17 2013 +

Resolves: #i120358# apply patch to support properties from tab model

Patch By: hanya
Review By: jsc

(cherry picked from commit aa098b9e612b30a916cd4ce002133d499d7f711a)

Conflicts:
include/toolkit/controls/controlmodelcontainerbase.hxx

Change-Id: I4c038c08d24ceceba606154573abbb1cd41cf7cb

diff --git a/include/toolkit/controls/controlmodelcontainerbase.hxx 
b/include/toolkit/controls/controlmodelcontainerbase.hxx
index ce9949a..ed4eddb 100644
--- a/include/toolkit/controls/controlmodelcontainerbase.hxx
+++ b/include/toolkit/controls/controlmodelcontainerbase.hxx
@@ -84,11 +84,10 @@ protected:
 AllGroups   maGroups;
 sal_BoolmbGroupsUpToDate;
 
-boolm_bEnabled;
-OUString m_sTitle;
+sal_Bool m_bEnabled;
 OUString m_sImageURL;
 OUString m_sTooltip;
-sal_Int16   m_nTabPageId;
+sal_Int16m_nTabPageId;
 
 voidClone_Impl(ControlModelContainerBase _rClone) const;
 protected:
diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx 
b/toolkit/source/awt/vclxtabpagecontainer.cxx
index 12d7af6..154e373 100644
--- a/toolkit/source/awt/vclxtabpagecontainer.cxx
+++ b/toolkit/source/awt/vclxtabpagecontainer.cxx
@@ -188,6 +188,7 @@ void SAL_CALL VCLXTabPageContainer::elementInserted( const 
::com::sun::star::con
 pTabCtrl-SetHelpText(nPageID,xP-getToolTip());
 
pTabCtrl-SetPageImage(nPageID,TkResMgr::getImageFromURL(xP-getImageURL()));
 pTabCtrl-SelectTabPage(nPageID);
+pTabCtrl-EnablePage(nPageID,xP-getEnabled());
 m_aTabPages.push_back(xTabPage);
 }
 }
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx 
b/toolkit/source/controls/controlmodelcontainerbase.cxx
index 6f16744..586af4a 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -215,6 +215,7 @@ ControlModelContainerBase::ControlModelContainerBase( const 
Reference XComponen
 ,maContainerListeners( *this )
 ,maChangeListeners ( GetMutex() )
 ,mbGroupsUpToDate( sal_False )
+,m_bEnabled( sal_True )
 {
 }
 
@@ -801,7 +802,6 @@ OUString SAL_CALL ControlModelContainerBase::getTitle() 
throw (::com::sun::star:
 OUString sTitle;
 xThis-getPropertyValue(GetPropertyName(BASEPROPERTY_TITLE)) = sTitle;
 return sTitle;
-//return m_sTitle;
 }
 void SAL_CALL ControlModelContainerBase::setTitle( const OUString _title ) 
throw (::com::sun::star::uno::RuntimeException)
 {
diff --git a/toolkit/source/controls/tabpagemodel.cxx 
b/toolkit/source/controls/tabpagemodel.cxx
index c3ca455..ec12abb 100644
--- a/toolkit/source/controls/tabpagemodel.cxx
+++ b/toolkit/source/controls/tabpagemodel.cxx
@@ -70,8 +70,6 @@ UnoControlTabPageModel::UnoControlTabPageModel( Reference 
XComponentContext  c
 ImplRegisterProperty( BASEPROPERTY_TITLE );
 ImplRegisterProperty( BASEPROPERTY_HELPTEXT );
 ImplRegisterProperty( BASEPROPERTY_HELPURL );
-ImplRegisterProperty( BASEPROPERTY_IMAGEURL );
-ImplRegisterProperty( BASEPROPERTY_ENABLED );
 }
 
 OUString UnoControlTabPageModel::getServiceName( ) throw(RuntimeException)
@@ -156,9 +154,7 @@ void SAL_CALL UnoControlTabPageModel::initialize (const 
SequenceAny rArgument
 ReferenceXPropertySet xThis(*this,UNO_QUERY);
 
xThis-setPropertyValue(s_sResourceResolver,xDialogProp-getPropertyValue(s_sResourceResolver));
 
xThis-setPropertyValue(GetPropertyName(BASEPROPERTY_TITLE),xDialogProp-getPropertyValue(GetPropertyName(BASEPROPERTY_TITLE)));
-
xThis-setPropertyValue(GetPropertyName(BASEPROPERTY_IMAGEURL),xDialogProp-getPropertyValue(GetPropertyName(BASEPROPERTY_IMAGEURL)));
 
xThis-setPropertyValue(GetPropertyName(BASEPROPERTY_HELPTEXT),xDialogProp-getPropertyValue(GetPropertyName(BASEPROPERTY_HELPTEXT)));
-
xThis-setPropertyValue(GetPropertyName(BASEPROPERTY_ENABLED),xDialogProp-getPropertyValue(GetPropertyName(BASEPROPERTY_ENABLED)));
 
xThis-setPropertyValue(GetPropertyName(BASEPROPERTY_HELPURL),xDialogProp-getPropertyValue(GetPropertyName(BASEPROPERTY_HELPURL)));
 }
 }
___
Libreoffice-commits mailing list

Re: [libreoffice-projects] [ANN] LIbreOffice 4.2.0 RC1 available

2013-12-20 Thread Christian Lohmaier

Hi Jean,

On Fri, Dec 20, 2013 at 6:24 AM, Jean Weber jeanwe...@gmail.com wrote:
 Mac OS X 10.9. Getting error message when attempting to start (open)
 the app after installing: LibreOffice.app is damaged and can't be
 opened. You should move it to the trash.

Ah, too bad :-(

As you're on 10.9 - did you use the 64bit build?

 This problem also occured with the Beta2, and Norbert said he thought
 the problem was with code-signing of non-release build.

Yeah, that is what we all hoped...

 Bug 71884. He
 fixed it by replacing with unsigned file, which worked fine.

Well, not really fixed, as that then also makes users unable to
directly open LibreOffice package, they'd have to use the
contextmenu...

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

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

2013-12-20 Thread Fridrich Štrba

 writerperfect/source/common/WPXSvStream.cxx |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit c85456b01bd8dd12792b76fb393f893496461c5c
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Fri Dec 20 16:36:53 2013 +0100

Simplify this condition a bit

Change-Id: Iceef995be9ff55306550e56a0be87dddab7a78c3

diff --git a/writerperfect/source/common/WPXSvStream.cxx 
b/writerperfect/source/common/WPXSvStream.cxx
index c803632..3b33a17 100644
--- a/writerperfect/source/common/WPXSvStream.cxx
+++ b/writerperfect/source/common/WPXSvStream.cxx
@@ -365,10 +365,9 @@ int WPXSvInputStream::seek(long offset, WPX_SEEK_TYPE 
seekType)
 
 mpImpl-invalidateReadBuffer();
 
-int retVal2 = mpImpl-seek(tmpOffset);
-if (retVal)
-return retVal;
-return retVal2;
+if (mpImpl-seek(tmpOffset))
+return -1;
+return retVal;
 }
 
 bool WPXSvInputStream::atEOS()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: odb ODF standard conformance [was: minutes of ESC call ...]

2013-12-20 Thread bjoern

On Fri, Dec 20, 2013 at 03:51:32PM +0100, Lionel Elie Mamane wrote:
 Why? What properties do you want from these IDs? Only that they are
 unique within the XML document, right?

You want to avoid volatility, if possibly to e.g. make simple format
unittests/watchdogs not getting either nervous (render false positives) or
complex.

Best,

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

Re: LibreOffice Gerrit News for core on 2013-12-09

On Fri, Dec 20, 2013 at 9:21 AM, bjoern bjoern.michael...@canonical.com wrote:
 On Tue, Dec 10, 2013 at 04:40:34PM +0100, Florian Effenberger wrote:
 sure, no worries - I think David or Norbert can add new users to the
 machine, at least they regularly do. :)

 What we need at least is a SSH key.

 AFAIK Mats accounts are set up, but it seems we never told him about it.

I have not acted yet on prod-gerrit..
I though that I would see some activity on dev before so that I'll
have a bit of time ahead of me

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

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

 sw/qa/core/data/rtf/pass/fdo72204.rtf   |   48 
 writerfilter/source/rtftok/rtfsdrimport.cxx |4 +-
 2 files changed, 51 insertions(+), 1 deletion(-)

New commits:
commit 3e199f81473d1f85a75238ac03d38a220f3ab818
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Fri Dec 20 16:51:35 2013 +0100

fdo#72204 RTF import: fix crash on rotated, but not imported groupshape

In case the groupshape contains textboxes and they contain table, we
don't import the groupshape itself, just the children, as drawinglayer
rectangles wouldn't handle tables.

If that's the case, don't try to apply properties on the groupshape, as
that would crash (the Writer drawpage implements XShapes, but not the
XShape interface).

Change-Id: Ie34039170314b772dd050eb354681cfaec61c1fa

diff --git a/sw/qa/core/data/rtf/pass/fdo72204.rtf 
b/sw/qa/core/data/rtf/pass/fdo72204.rtf
new file mode 100644
index 000..052a639
--- /dev/null
+++ b/sw/qa/core/data/rtf/pass/fdo72204.rtf
@@ -0,0 +1,48 @@
+{\rtf1
+{\shpgrp
+{\*\shpinst\shpleft-950\shptop156\shpright1583\shpbottom2942\shpfhdr0\shpbxcolumn\shpbxignore\shpbypara\shpbyignore\shpwr3\shpwrk0\shpfblwtxt0\shpz0\shplid1036
+{\sp{\sn groupLeft}{\sv 1621}}
+{\sp{\sn groupTop}{\sv 2621}}
+{\sp{\sn groupRight}{\sv 4154}}
+{\sp{\sn groupBottom}{\sv 5407}}
+{\sp{\sn rotation}{\sv 0}}
+{\shp
+{\*\shpinst\shplid1037
+{\sp{\sn relLeft}{\sv 1621}}
+{\sp{\sn relTop}{\sv 2621}}
+{\sp{\sn relRight}{\sv 4154}}
+{\sp{\sn relBottom}{\sv 5092}}
+{\sp{\sn shapeType}{\sv 202}}
+{\shptxt \ltrpar \trowd 
+\clbrdrt\brdrtbl \clbrdrl\brdrtbl \clbrdrb\brdrtbl \clbrdrr\brdrtbl \cellx567
+\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10 \clbrdrb\brdrs\brdrw10 
\clbrdrr\brdrs\brdrw10 \cellx1134\clbrdrt\brdrtbl \clbrdrl\brdrnone 
\clbrdrb\brdrtbl \clbrdrr\brdrtbl 
+\cellx1701\clbrdrt\brdrtbl \clbrdrl\brdrtbl \clbrdrb\brdrtbl \clbrdrr\brdrtbl 
\cltxlrtb\cellx2268\pard\plain \ltrpar\ql 
+\intbl \rtlch \afs22\alang1025 \ltrch 
\lang1038\langfe1033\loch\hich\dbch\cgrid\langnp1038\langfenp1033 
+{\rtlch \ltrch 
+\hich\dbch\loch\f37 a)\cell }
+\pard \ltrpar\qc \intbl 
+{\rtlch \ltrch 
+\cell \cell \cell }
+\pard \ltrpar\ql \intbl 
+{\rtlch \ltrch \trowd 
+\clbrdrt\brdrtbl \clbrdrl\brdrtbl \clbrdrb\brdrtbl \clbrdrr\brdrtbl \cellx567
+\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10 \clbrdrb\brdrs\brdrw10 
\clbrdrr\brdrs\brdrw10 \cellx1134\clbrdrt\brdrtbl \clbrdrl\brdrnone 
\clbrdrb\brdrtbl \clbrdrr\brdrtbl 
+\cellx1701\clbrdrt\brdrtbl \clbrdrl\brdrtbl \clbrdrb\brdrtbl \clbrdrr\brdrtbl 
\cltxlrtb\cellx2268\row }
+\trowd \clbrdrt\brdrtbl \clbrdrl\brdrtbl \clbrdrb\brdrtbl \clbrdrr\brdrtbl 
\cellx567
+\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10 \clbrdrb\brdrs\brdrw10 
\clbrdrr\brdrs\brdrw10 \cellx1134\clbrdrt\brdrtbl \clbrdrl\brdrnone 
\clbrdrb\brdrtbl \clbrdrr\brdrtbl 
+\cellx1701\clbrdrt\brdrtbl \clbrdrl\brdrtbl \clbrdrb\brdrtbl \clbrdrr\brdrtbl 
\cltxlrtb\cellx2268\pard \ltrpar\qc 
+\intbl 
+{\rtlch \ltrch \cell \cell \cell \cell }
+\pard \ltrpar\ql \intbl 
+{\rtlch \ltrch \trowd 
+\clbrdrt\brdrtbl \clbrdrl\brdrtbl \clbrdrb\brdrtbl \clbrdrr\brdrtbl \cellx567
+\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10 \clbrdrb\brdrs\brdrw10 
\clbrdrr\brdrs\brdrw10 \cellx1134\clbrdrt\brdrtbl \clbrdrl\brdrnone 
\clbrdrb\brdrtbl \clbrdrr\brdrtbl 
+\cellx1701\clbrdrt\brdrtbl \clbrdrl\brdrtbl \clbrdrb\brdrtbl \clbrdrr\brdrtbl 
\cltxlrtb\cellx2268\row }
+\pard \ltrpar\ql \itap0\par
+}
+}
+}
+}
+}
+\par
+}
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx 
b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 4ee..3d9df8b 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -704,7 +704,9 @@ void RTFSdrImport::append(OUString aKey, OUString aValue)
 
 void RTFSdrImport::appendGroupProperty(OUString aKey, OUString aValue)
 {
-applyProperty(uno::Referencedrawing::XShape(m_aParents.top(), 
uno::UNO_QUERY), aKey, aValue);
+uno::Referencedrawing::XShape xShape(m_aParents.top(), uno::UNO_QUERY);
+if (xShape.is())
+applyProperty(xShape, aKey, aValue);
 }
 
 } // namespace rtftok
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [libreoffice-projects] [ANN] LIbreOffice 4.2.0 RC1 available

On Thu, Dec 19, 2013 at 11:24 PM, Jean Weber jeanwe...@gmail.com wrote:
 Mac OS X 10.9. Getting error message when attempting to start (open)
 the app after installing: LibreOffice.app is damaged and can't be
 opened. You should move it to the trash.

 This problem also occured with the Beta2, and Norbert said he thought
 the problem was with code-signing of non-release build. Bug 71884. He
 fixed it by replacing with unsigned file, which worked fine.

Well obviously that was not the cause of my trouble :-(  /me is
investigating ...
and not signing was not a 'solution' merely a stop-gap to try to get
something somewhat usable out there.. but that is not an option for a
RC.

Jean, can you try the 64bits  build ?

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 18/31b6c95e6137432f64729a270e53fc39e46217

 18/31b6c95e6137432f64729a270e53fc39e46217 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 48dd97807648d3ff6bf186284ed49da83d700278
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Dec 20 16:16:42 2013 +

Notes added by 'git notes add'

diff --git a/18/31b6c95e6137432f64729a270e53fc39e46217 
b/18/31b6c95e6137432f64729a270e53fc39e46217
new file mode 100644
index 000..fd7bafd
--- /dev/null
+++ b/18/31b6c95e6137432f64729a270e53fc39e46217
@@ -0,0 +1 @@
+merged as: bc4f7d26b5a58b935d62de42a9612b2e2b6a8c52
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/source/filter/xml/xmlstyle.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 11a73705d9dd10ebefa2bcdefa560f55e7024a1b
Author: Eike Rathke er...@redhat.com
Date:   Fri Dec 20 17:12:00 2013 +0100

prepare to read loext:vertical-justify, fdo#72922

Change-Id: I56d72d5cb8ea95aa63d4659899cba2f295ce9bea

diff --git a/sc/source/filter/xml/xmlstyle.cxx 
b/sc/source/filter/xml/xmlstyle.cxx
index e904315..da3e882 100644
--- a/sc/source/filter/xml/xmlstyle.cxx
+++ b/sc/source/filter/xml/xmlstyle.cxx
@@ -55,7 +55,10 @@ using namespace ::xmloff::token;
 using namespace ::formula;
 
 #define MAP(name,prefix,token,type,context)  { name, sizeof(name)-1, prefix, 
token, type, context, SvtSaveOptions::ODFVER_010, false }
+// extensions import/export
 #define MAP_EXT(name,prefix,token,type,context)  { name, sizeof(name)-1, 
prefix, token, type, context, SvtSaveOptions::ODFVER_012_EXT_COMPAT, false }
+// extensions import only
+#define MAP_EXT_I(name,prefix,token,type,context)  { name, sizeof(name)-1, 
prefix, token, type, context, SvtSaveOptions::ODFVER_012_EXT_COMPAT, true }
 #define MAP_END()   { NULL, 0, 0, XML_TOKEN_INVALID, 0, 0, 
SvtSaveOptions::ODFVER_010, false }
 
 const XMLPropertyMapEntry aXMLScCellStylesProperties[] =
@@ -106,7 +109,8 @@ const XMLPropertyMapEntry aXMLScCellStylesProperties[] =
 MAP( UserDefinedAttributes, XML_NAMESPACE_TEXT, XML_XMLNS, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_ATTRIBUTE_CONTAINER | MID_FLAG_SPECIAL_ITEM, 
0 ),
 MAP( ValidationXML, XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATION, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BUILDIN_CMP_ONLY, CTF_SC_VALIDATION ),
 MAP( VertJustify, XML_NAMESPACE_STYLE, XML_VERTICAL_ALIGN, 
XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_VERTJUSTIFY, 0),
-MAP_EXT( SC_UNONAME_CELLVJUS_METHOD, XML_NAMESPACE_STYLE, 
XML_VERTICAL_JUSTIFY, XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_VERTJUSTIFY_METHOD, 
0 ),
+MAP_EXT( SC_UNONAME_CELLVJUS_METHOD, XML_NAMESPACE_STYLE, 
XML_VERTICAL_JUSTIFY, XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_VERTJUSTIFY_METHOD, 
0 ),   // proposed ODF 1.2+
+MAP_EXT_I( SC_UNONAME_CELLVJUS_METHOD, XML_NAMESPACE_LO_EXT, 
XML_VERTICAL_JUSTIFY, XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_VERTJUSTIFY_METHOD, 
0 ),// extension namespace
 MAP_END()
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: minutes of ESC call ...

[ Adding Florian to CC, I don't think he's reading this list. ]

On Thu, Dec 19, 2013 at 10:20:11PM +0100, Mat M m...@gmx.fr wrote:
 Florian, in [1], asked for an SSH key so I can get access to the
 script machine. I sent a mail in early 11th of Dec with my public
 key to David O, Norbert, Florian and CCed Bjoern.
 
 I don't mind having my access after holiday break, but I would like
 to have a feedback, so I don't check my mails anxiously, seeing all
 those not-so-new committers day after day :)
 
 Regards,
 
 Mat
 
 Season's Greetings !
 
 [1] 
 http://nabble.documentfoundation.org/LibreOffice-Gerrit-News-for-core-on-2013-12-09-tp4087321p4087591.html


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

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

 sd/source/ui/unoidl/DrawController.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bc4f7d26b5a58b935d62de42a9612b2e2b6a8c52
Author: JÃ¼rgen Schmidt j...@apache.org
Date:   Fri Dec 20 13:36:19 2013 +

Resolves: #i123783# apply patch to correct type of ActiveLayer property

Patch By: hanya
Review By: jsc

(cherry picked from commit 1831b6c95e6137432f64729a270e53fc39e46217)

Change-Id: Iad149ff5350ac63270ea0ae84343f7ef5fdde1a2

diff --git a/sd/source/ui/unoidl/DrawController.cxx 
b/sd/source/ui/unoidl/DrawController.cxx
index 2efc800..4068a51 100644
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -727,7 +727,7 @@ void DrawController::FillPropertyTable (
 rProperties.push_back(
 beans::Property(ActiveLayer,
 PROPERTY_ACTIVE_LAYER,
-::getCppuBooleanType(),
+::getCppuType((const Reference drawing::XLayer  *)0),
 beans::PropertyAttribute::BOUND ));
 rProperties.push_back(
 beans::Property(ZoomValue,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-12-20 Thread Adam Co

 sw/source/filter/ww8/attributeoutputbase.hxx |8 
 sw/source/filter/ww8/docxattributeoutput.cxx |9 +++--
 sw/source/filter/ww8/docxattributeoutput.hxx |2 +-
 sw/source/filter/ww8/rtfattributeoutput.cxx  |2 +-
 sw/source/filter/ww8/rtfattributeoutput.hxx  |2 +-
 sw/source/filter/ww8/wrtw8nds.cxx|5 +++--
 sw/source/filter/ww8/ww8atr.cxx  |6 +++---
 sw/source/filter/ww8/ww8attributeoutput.hxx  |2 +-
 8 files changed, 21 insertions(+), 15 deletions(-)

New commits:
commit f9df93c76b28b92c8df83fcfead173282e1e9521
Author: Adam Co rattles2...@gmail.com
Date:   Wed Dec 18 12:31:29 2013 +0200

Support DOCX exporting 'Track Changes - Inserted Paragraph Mark'

This patch adds support for the DOCX exporter to export the
'Track Changes' of type 'Inserted Paragraph Marker'.

Change-Id: Iaab42c1b678bb83832f519a2f2a8fbc42b9d729d
Reviewed-on: https://gerrit.libreoffice.org/7128
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx 
b/sw/source/filter/ww8/attributeoutputbase.hxx
index 06ef068..d8b83e1 100644
--- a/sw/source/filter/ww8/attributeoutputbase.hxx
+++ b/sw/source/filter/ww8/attributeoutputbase.hxx
@@ -31,6 +31,7 @@
 #include swtypes.hxx
 #include wrtswtbl.hxx
 #include fldbas.hxx
+#include IDocumentRedlineAccess.hxx
 
 #include vector
 
@@ -160,7 +161,7 @@ public:
 virtual void StartParagraphProperties() = 0;
 
 /// Called after we end outputting the attributes.
-virtual void EndParagraphProperties( const SwRedlineData* pRedlineData, 
const SwRedlineData* pRedlineParagraphMarkerDeleted ) = 0;
+virtual void EndParagraphProperties( const SwRedlineData* pRedlineData, 
const SwRedlineData* pRedlineParagraphMarkerDeleted, const SwRedlineData* 
pRedlineParagraphMarkerInserted ) = 0;
 
 /// Empty paragraph.
 virtual void EmptyParagraph() = 0;
@@ -635,9 +636,8 @@ public:
 /// Exports the definition (image, size) of a single numbering picture 
bullet.
 virtual void BulletDefinition(int /*nId*/, const Graphic /*rGraphic*/, 
Size /*aSize*/) {}
 
-// Returns whether or not the 'SwTxtNode' has a paragraph marker deleted 
(using 'track changes')
-virtual const SwRedlineData* GetDeletedParagraphMarker( const SwTxtNode 
rNode );
-
+// Returns whether or not the 'SwTxtNode' has a paragraph marker inserted 
\ deleted (using 'track changes')
+virtual const SwRedlineData* GetParagraphMarkerRedline( const SwTxtNode 
rNode, RedlineType_t aRedlineType );
 };
 
 #endif // INCLUDED_SW_SOURCE_FILTER_WW8_ATTRIBUTEOUTPUTBASE_HXX
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 924aa1b..7daf788 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -696,7 +696,7 @@ void 
DocxAttributeOutput::WriteCollectedParagraphProperties()
 }
 }
 
-void DocxAttributeOutput::EndParagraphProperties( const SwRedlineData* 
pRedlineData, const SwRedlineData* pRedlineParagraphMarkerDeleted )
+void DocxAttributeOutput::EndParagraphProperties( const SwRedlineData* 
pRedlineData, const SwRedlineData* pRedlineParagraphMarkerDeleted, const 
SwRedlineData* pRedlineParagraphMarkerInserted )
 {
 // Call the 'Redline' function. This will add redline (change-tracking) 
information that regards to paragraph properties.
 // This includes changes like 'Bold', 'Underline', 'Strikethrough' etc.
@@ -706,7 +706,7 @@ void DocxAttributeOutput::EndParagraphProperties( const 
SwRedlineData* pRedlineD
 
 // Write 'Paragraph Mark' properties
 bool bIsParagraphMarkProperties = false; // In future - get the 'paragraph 
marker' properties as a parameter
-if (bIsParagraphMarkProperties || pRedlineParagraphMarkerDeleted)
+if (bIsParagraphMarkProperties || pRedlineParagraphMarkerDeleted || 
pRedlineParagraphMarkerInserted)
 {
 m_pSerializer-startElementNS( XML_w, XML_rPr, FSEND );
 
@@ -715,6 +715,11 @@ void DocxAttributeOutput::EndParagraphProperties( const 
SwRedlineData* pRedlineD
 StartRedline( pRedlineParagraphMarkerDeleted );
 EndRedline( pRedlineParagraphMarkerDeleted );
 }
+if ( pRedlineParagraphMarkerInserted )
+{
+StartRedline( pRedlineParagraphMarkerInserted );
+EndRedline( pRedlineParagraphMarkerInserted );
+}
 
 m_pSerializer-endElementNS( XML_w, XML_rPr );
 }
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx 
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 8ebf31e..62ec9f4 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -141,7 +141,7 @@ public:
 virtual void StartParagraphProperties();
 
 /// Called after we end outputting the attributes.
-virtual void EndParagraphProperties( const

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

 sc/source/filter/xml/xmlstyle.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit d7a316336ef2b123b2fa0769f8ff87c2480528ce
Author: Eike Rathke er...@redhat.com
Date:   Fri Dec 20 17:12:00 2013 +0100

prepare to read loext:vertical-justify, fdo#72922

Change-Id: I56d72d5cb8ea95aa63d4659899cba2f295ce9bea
(cherry picked from commit 11a73705d9dd10ebefa2bcdefa560f55e7024a1b)

diff --git a/sc/source/filter/xml/xmlstyle.cxx 
b/sc/source/filter/xml/xmlstyle.cxx
index e904315..da3e882 100644
--- a/sc/source/filter/xml/xmlstyle.cxx
+++ b/sc/source/filter/xml/xmlstyle.cxx
@@ -55,7 +55,10 @@ using namespace ::xmloff::token;
 using namespace ::formula;
 
 #define MAP(name,prefix,token,type,context)  { name, sizeof(name)-1, prefix, 
token, type, context, SvtSaveOptions::ODFVER_010, false }
+// extensions import/export
 #define MAP_EXT(name,prefix,token,type,context)  { name, sizeof(name)-1, 
prefix, token, type, context, SvtSaveOptions::ODFVER_012_EXT_COMPAT, false }
+// extensions import only
+#define MAP_EXT_I(name,prefix,token,type,context)  { name, sizeof(name)-1, 
prefix, token, type, context, SvtSaveOptions::ODFVER_012_EXT_COMPAT, true }
 #define MAP_END()   { NULL, 0, 0, XML_TOKEN_INVALID, 0, 0, 
SvtSaveOptions::ODFVER_010, false }
 
 const XMLPropertyMapEntry aXMLScCellStylesProperties[] =
@@ -106,7 +109,8 @@ const XMLPropertyMapEntry aXMLScCellStylesProperties[] =
 MAP( UserDefinedAttributes, XML_NAMESPACE_TEXT, XML_XMLNS, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_ATTRIBUTE_CONTAINER | MID_FLAG_SPECIAL_ITEM, 
0 ),
 MAP( ValidationXML, XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATION, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BUILDIN_CMP_ONLY, CTF_SC_VALIDATION ),
 MAP( VertJustify, XML_NAMESPACE_STYLE, XML_VERTICAL_ALIGN, 
XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_VERTJUSTIFY, 0),
-MAP_EXT( SC_UNONAME_CELLVJUS_METHOD, XML_NAMESPACE_STYLE, 
XML_VERTICAL_JUSTIFY, XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_VERTJUSTIFY_METHOD, 
0 ),
+MAP_EXT( SC_UNONAME_CELLVJUS_METHOD, XML_NAMESPACE_STYLE, 
XML_VERTICAL_JUSTIFY, XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_VERTJUSTIFY_METHOD, 
0 ),   // proposed ODF 1.2+
+MAP_EXT_I( SC_UNONAME_CELLVJUS_METHOD, XML_NAMESPACE_LO_EXT, 
XML_VERTICAL_JUSTIFY, XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_VERTJUSTIFY_METHOD, 
0 ),// extension namespace
 MAP_END()
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sax/source/fastparser/fastparser.cxx |  145 ++-
 1 file changed, 77 insertions(+), 68 deletions(-)

New commits:
commit 59003de73eff0da22d01f2fd3cddc78bf3a3a3f8
Author: Michael Meeks michael.me...@collabora.com
Date:   Fri Dec 20 16:18:48 2013 +

fastparser: fix load regression

Remove erroneous assert: maSavedException is indeed empty for
XML parser reported exceptions. Clean cut/paste code, and comment.

Change-Id: Ia538bcc87a7efcd079d3021e00ac4d2eb62f3e8d

diff --git a/sax/source/fastparser/fastparser.cxx 
b/sax/source/fastparser/fastparser.cxx
index 04cfbee..3b93765 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -77,12 +77,12 @@ enum CallbackType { INVALID, START_ELEMENT, END_ELEMENT, 
CHARACTERS, DONE, EXCEP
 
 struct Event
 {
-OUString msChars;
+CallbackType maType;
 sal_Int32 mnElementToken;
 OUString msNamespace;
 OUString msElementName;
 rtl::Reference FastAttributeList  mxAttributes;
-CallbackType maType;
+OUString msChars;
 };
 
 struct NameWithToken
@@ -165,9 +165,13 @@ struct Entity : public ParserData
 XML_Parser  mpParser;
 ::sax_expatwrap::XMLFile2UTFConverter   maConverter;
 
-// Exceptions cannot be thrown through the C-XmlParser (possible resource 
leaks),
-// therefore the exception must be saved somewhere.
-::com::sun::star::uno::Any  maSavedException;
+// Exceptions cannot be thrown through the C-XmlParser (possible
+// resource leaks), therefore any exception thrown by a UNO callback
+// must be saved somewhere until the C-XmlParser is stopped.
+::com::sun::star::uno::Any maSavedException;
+void saveException( const Exception e );
+void throwException( const ::rtl::Reference FastLocatorImpl  
xDocumentLocator,
+ bool mbDuringParse );
 
 ::std::stack NameWithTokenmaNamespaceStack;
 /* Context for main thread consuming events.
@@ -272,9 +276,10 @@ private:
 {
 mpParser-parse();
 }
-catch (const SAXParseException)
+catch (const Exception e)
 {
-mpParser-getEntity().getEvent( EXCEPTION );
+Entity rEntity = mpParser-getEntity();
+rEntity.getEvent( EXCEPTION );
 mpParser-produce( EXCEPTION );
 }
 }
@@ -454,7 +459,7 @@ void Entity::startElement( Event *pEvent )
 }
 catch (const Exception e)
 {
-maSavedException = e;
+saveException( e );
 }
 }
 
@@ -467,7 +472,7 @@ void Entity::characters( const OUString sChars )
 }
 catch (const Exception e)
 {
-maSavedException = e;
+saveException( e );
 }
 }
 
@@ -485,7 +490,7 @@ void Entity::endElement()
 }
 catch (const Exception e)
 {
-maSavedException = e;
+saveException( e );
 }
 maContextStack.pop();
 }
@@ -781,7 +786,7 @@ void FastSaxParserImpl::parseStream( const InputSource 
maStructSource) throw (S
 {
 popEntity();
 XML_ParserFree( entity.mpParser );
-  throw;
+throw;
 }
 catch (const IOException)
 {
@@ -958,7 +963,7 @@ bool FastSaxParserImpl::consume(EventList *pEventList)
 {
 Entity rEntity = getEntity();
 for (EventList::iterator aEventIt = pEventList-begin();
-aEventIt != pEventList-end(); ++aEventIt)
+ aEventIt != pEventList-end(); ++aEventIt)
 {
 switch ((*aEventIt).maType)
 {
@@ -974,28 +979,8 @@ bool FastSaxParserImpl::consume(EventList *pEventList)
 case DONE:
 return false;
 case EXCEPTION:
-{
-assert( rEntity.maSavedException.hasValue() );
-// Error during parsing !
-XML_Error xmlE = XML_GetErrorCode( rEntity.mpParser );
-OUString sSystemId = mxDocumentLocator-getSystemId();
-sal_Int32 nLine = mxDocumentLocator-getLineNumber();
-
-SAXParseException aExcept(
-lclGetErrorMessage( xmlE, sSystemId, nLine ),
-Reference XInterface (),
-Any( rEntity.maSavedException, getCppuType( 
rEntity.maSavedException ) ),
-mxDocumentLocator-getPublicId(),
-mxDocumentLocator-getSystemId(),
-mxDocumentLocator-getLineNumber(),
-mxDocumentLocator-getColumnNumber()
-);
-// error handler is set, it may throw the exception
-if( rEntity.mxErrorHandler.is() )
-rEntity.mxErrorHandler-fatalError( Any( aExcept ) );
-
-throw aExcept;
-}
+rEntity.throwException( mxDocumentLocator, false );
+return false;
 default:
 assert(false);
 return false;
@@

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

 sc/source/ui/unoobj/viewuno.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit fe506f34f2dccb6562935fe4dfbc1fe6d609dec8
Author: JÃ¼rgen Schmidt j...@apache.org
Date:   Fri Dec 20 13:56:32 2013 +

Resolves: #i91439# copy key modifiers as well

Patch By: hanya
Review By: jsc

(cherry picked from commit 5dfcb178f89532a92b4565739d3445a56abfd095)

Change-Id: Icc593172c0ea2243d9ceffb0a1cd11ec515a137a

diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index 6570476..1b9319f 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -1212,6 +1212,7 @@ sal_Bool ScTabViewObj::MousePressed( const 
awt::MouseEvent e )
 aMouseEvent.ClickCount = e.ClickCount;
 aMouseEvent.PopupTrigger = e.PopupTrigger;
 aMouseEvent.Target = xTarget;
+aMouseEvent.Modifiers = e.Modifiers;
 
 for (XMouseClickHandlerVector::iterator it = 
aMouseClickHandlers.begin(); it != aMouseClickHandlers.end(); )
 {
@@ -1326,6 +1327,7 @@ sal_Bool ScTabViewObj::MouseReleased( const 
awt::MouseEvent e )
 aMouseEvent.ClickCount = e.ClickCount;
 aMouseEvent.PopupTrigger = e.PopupTrigger;
 aMouseEvent.Target = xTarget;
+aMouseEvent.Modifiers = e.Modifiers;
 
 for (XMouseClickHandlerVector::iterator it = 
aMouseClickHandlers.begin(); it != aMouseClickHandlers.end(); )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 5d/fcb178f89532a92b4565739d3445a56abfd095

 5d/fcb178f89532a92b4565739d3445a56abfd095 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 29b4d0c9382800270bd260fb1e5037d40306cae0
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Dec 20 16:27:05 2013 +

Notes added by 'git notes add'

diff --git a/5d/fcb178f89532a92b4565739d3445a56abfd095 
b/5d/fcb178f89532a92b4565739d3445a56abfd095
new file mode 100644
index 000..7cea060
--- /dev/null
+++ b/5d/fcb178f89532a92b4565739d3445a56abfd095
@@ -0,0 +1 @@
+merged as: fe506f34f2dccb6562935fe4dfbc1fe6d609dec8
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sax/source/fastparser/fastparser.cxx |   92 +--
 1 file changed, 46 insertions(+), 46 deletions(-)

New commits:
commit 169eb25c86c28aae02345c92e04572abbf08d77a
Author: Michael Meeks michael.me...@collabora.com
Date:   Fri Dec 20 16:36:42 2013 +

fastparser:: move Entity:: code into the anonymous namespace.

Change-Id: I564e35aa63e4c01cc1a0fb45f674dc1a2a0e89ec

diff --git a/sax/source/fastparser/fastparser.cxx 
b/sax/source/fastparser/fastparser.cxx
index 3b93765..9171652 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -528,6 +528,52 @@ Event Entity::getEvent( CallbackType aType )
 return rEvent;
 }
 
+// throw an exception, but avoid callback if
+// during a threaded produce
+void Entity::throwException( const ::rtl::Reference FastLocatorImpl  
xDocumentLocator,
+ bool mbDuringParse )
+{
+// Error during parsing !
+SAXParseException aExcept(
+lclGetErrorMessage( XML_GetErrorCode( mpParser ),
+xDocumentLocator-getSystemId(),
+xDocumentLocator-getLineNumber() ),
+Reference XInterface (),
+Any( maSavedException, getCppuType( maSavedException ) ),
+xDocumentLocator-getPublicId(),
+xDocumentLocator-getSystemId(),
+xDocumentLocator-getLineNumber(),
+xDocumentLocator-getColumnNumber()
+);
+
+// error handler is set, it may throw the exception
+if( !mbDuringParse || !mbEnableThreads )
+{
+if (mxErrorHandler.is() )
+mxErrorHandler-fatalError( Any( aExcept ) );
+}
+
+// error handler has not thrown, but parsing must stop = throw ourselves
+throw aExcept;
+}
+
+// In the single threaded case we emit events via our C
+// callbacks, so any exception caught must be queued up until
+// we can safely re-throw it from our C++ parent of parse()
+//
+// If multi-threaded, we need to push an EXCEPTION event, at
+// which point we transfer ownership of maSavedException to
+// the consuming thread.
+void Entity::saveException( const Exception e )
+{
+// only store the first exception
+if( !maSavedException.hasValue() )
+{
+maSavedException = e;
+XML_StopParser( mpParser, /* resumable? */ XML_FALSE );
+}
+}
+
 } // namespace
 
 namespace sax_fastparser {
@@ -1009,35 +1055,6 @@ const Entity FastSaxParserImpl::getEntity() const
 return maEntities.top();
 }
 
-// throw an exception, but avoid callback if
-// during a threaded produce
-void Entity::throwException( const ::rtl::Reference FastLocatorImpl  
xDocumentLocator,
- bool mbDuringParse )
-{
-// Error during parsing !
-SAXParseException aExcept(
-lclGetErrorMessage( XML_GetErrorCode( mpParser ),
-xDocumentLocator-getSystemId(),
-xDocumentLocator-getLineNumber() ),
-Reference XInterface (),
-Any( maSavedException, getCppuType( maSavedException ) ),
-xDocumentLocator-getPublicId(),
-xDocumentLocator-getSystemId(),
-xDocumentLocator-getLineNumber(),
-xDocumentLocator-getColumnNumber()
-);
-
-// error handler is set, it may throw the exception
-if( !mbDuringParse || !mbEnableThreads )
-{
-if (mxErrorHandler.is() )
-mxErrorHandler-fatalError( Any( aExcept ) );
-}
-
-// error handler has not thrown, but parsing must stop = throw ourselves
-throw aExcept;
-}
-
 // starts parsing with actual parser !
 void FastSaxParserImpl::parse()
 {
@@ -1068,23 +1085,6 @@ void FastSaxParserImpl::parse()
 produce( DONE );
 }
 
-// In the single threaded case we emit events via our C
-// callbacks, so any exception caught must be queued up until
-// we can safely re-throw it from our C++ parent of parse()
-//
-// If multi-threaded, we need to push an EXCEPTION event, at
-// which point we transfer ownership of maSavedException to
-// the consuming thread.
-void Entity::saveException( const Exception e )
-{
-// only store the first exception
-if( !maSavedException.hasValue() )
-{
-maSavedException = e;
-XML_StopParser( mpParser, /* resumable? */ XML_FALSE );
-}
-}
-
 //--
 //
 // The C-Callbacks
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sax/source/fastparser/fastparser.cxx |   82 +--
 1 file changed, 41 insertions(+), 41 deletions(-)

New commits:
commit 838a6011c19870ea36695aab4b4497dcbd1880f5
Author: Michael Meeks michael.me...@collabora.com
Date:   Fri Dec 20 16:45:15 2013 +

fastparser: move lclGetErrorMessage into the anonymous namespace.

Change-Id: I70e1597f917c2a8dedb5b38807dfde7ec05a1a39

diff --git a/sax/source/fastparser/fastparser.cxx 
b/sax/source/fastparser/fastparser.cxx
index 9171652..f2f90c4 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -528,6 +528,47 @@ Event Entity::getEvent( CallbackType aType )
 return rEvent;
 }
 
+OUString lclGetErrorMessage( XML_Error xmlE, const OUString sSystemId, 
sal_Int32 nLine )
+{
+const sal_Char* pMessage = ;
+switch( xmlE )
+{
+case XML_ERROR_NONE:pMessage = No;   
 break;
+case XML_ERROR_NO_MEMORY:   pMessage = no 
memory; break;
+case XML_ERROR_SYNTAX:  pMessage = syntax;   
 break;
+case XML_ERROR_NO_ELEMENTS: pMessage = no 
elements;   break;
+case XML_ERROR_INVALID_TOKEN:   pMessage = invalid 
token; break;
+case XML_ERROR_UNCLOSED_TOKEN:  pMessage = unclosed 
token;break;
+case XML_ERROR_PARTIAL_CHAR:pMessage = partial 
char;  break;
+case XML_ERROR_TAG_MISMATCH:pMessage = tag 
mismatch;  break;
+case XML_ERROR_DUPLICATE_ATTRIBUTE: pMessage = duplicate 
attribute;   break;
+case XML_ERROR_JUNK_AFTER_DOC_ELEMENT:  pMessage = junk after 
doc element;break;
+case XML_ERROR_PARAM_ENTITY_REF:pMessage = parameter 
entity reference;break;
+case XML_ERROR_UNDEFINED_ENTITY:pMessage = undefined 
entity;  break;
+case XML_ERROR_RECURSIVE_ENTITY_REF:pMessage = recursive 
entity reference;break;
+case XML_ERROR_ASYNC_ENTITY:pMessage = async 
entity;  break;
+case XML_ERROR_BAD_CHAR_REF:pMessage = bad char 
reference;break;
+case XML_ERROR_BINARY_ENTITY_REF:   pMessage = binary 
entity reference;   break;
+case XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF:   pMessage = attribute 
external entity reference;   break;
+case XML_ERROR_MISPLACED_XML_PI:pMessage = misplaced 
xml processing instruction;  break;
+case XML_ERROR_UNKNOWN_ENCODING:pMessage = unknown 
encoding;  break;
+case XML_ERROR_INCORRECT_ENCODING:  pMessage = incorrect 
encoding;break;
+case XML_ERROR_UNCLOSED_CDATA_SECTION:  pMessage = unclosed 
cdata section;break;
+case XML_ERROR_EXTERNAL_ENTITY_HANDLING:pMessage = external 
entity reference; break;
+case XML_ERROR_NOT_STANDALONE:  pMessage = not 
standalone;break;
+default:;
+}
+
+OUStringBuffer aBuffer( '[' );
+aBuffer.append( sSystemId );
+aBuffer.append(  line  );
+aBuffer.append( nLine );
+aBuffer.append( ]:  );
+aBuffer.appendAscii( pMessage );
+aBuffer.append(  error );
+return aBuffer.makeStringAndClear();
+}
+
 // throw an exception, but avoid callback if
 // during a threaded produce
 void Entity::throwException( const ::rtl::Reference FastLocatorImpl  
xDocumentLocator,
@@ -902,47 +943,6 @@ void FastSaxParserImpl::setLocale( const Locale  Locale ) 
throw (RuntimeExcepti
 maData.maLocale = Locale;
 }
 
-static OUString lclGetErrorMessage( XML_Error xmlE, const OUString sSystemId, 
sal_Int32 nLine )
-{
-const sal_Char* pMessage = ;
-switch( xmlE )
-{
-case XML_ERROR_NONE:pMessage = No;   
 break;
-case XML_ERROR_NO_MEMORY:   pMessage = no 
memory; break;
-case XML_ERROR_SYNTAX:  pMessage = syntax;   
 break;
-case XML_ERROR_NO_ELEMENTS: pMessage = no 
elements;   break;
-case XML_ERROR_INVALID_TOKEN:   pMessage = invalid 
token; break;
-case XML_ERROR_UNCLOSED_TOKEN:  pMessage = unclosed 
token;break;
-case

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

2013-12-20 Thread Fridrich Štrba

 svx/source/tbxctrls/layctrl.cxx |   15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)

New commits:
commit 1d18297e1fd65e7e4d6b26a65deb8e33fe38fac7
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Fri Dec 20 18:00:38 2013 +0100

C++11 is not everywhere, so be wise

Change-Id: I5935caa1d3c54bc9becd01a96499ca9158ea468c

diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index eb55215..d519ddc3 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -62,11 +62,11 @@ private:
 long TABLE_CELL_WIDTH;
 long TABLE_CELL_HEIGHT;
 
-const long TABLE_CELLS_HORIZ = 10;
-const long TABLE_CELLS_VERT  = 15;
+const long TABLE_CELLS_HORIZ;
+const long TABLE_CELLS_VERT;
 
-long TABLE_POS_X = 2;
-long TABLE_POS_Y = 2;
+long TABLE_POS_X;
+long TABLE_POS_Y;
 
 long TABLE_WIDTH;
 long TABLE_HEIGHT;
@@ -111,11 +111,16 @@ TableWindow::TableWindow( sal_uInt16 nSlotId, const 
OUString rCmd, const OUStri
 nLine( 0 ),
 rTbx(rParentTbx),
 mxFrame( rFrame ),
-maCommand( rCmd )
+maCommand( rCmd ),
+TABLE_CELLS_HORIZ(10),
+TABLE_CELLS_VERT(15),
+TABLE_POS_X(2),
+TABLE_POS_Y(2)
 {
 TABLE_CELL_WIDTH  = 15 * GetDPIScaleFactor();
 TABLE_CELL_HEIGHT = 15 * GetDPIScaleFactor();
 
+
 TABLE_WIDTH  = TABLE_POS_X + TABLE_CELLS_HORIZ*TABLE_CELL_WIDTH;
 TABLE_HEIGHT = TABLE_POS_Y + TABLE_CELLS_VERT*TABLE_CELL_HEIGHT;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sw/qa/core/data/rtf/pass/fdo72204.rtf   |   48 
 writerfilter/source/rtftok/rtfsdrimport.cxx |4 +-
 2 files changed, 51 insertions(+), 1 deletion(-)

New commits:
commit c3d1e74fa1de47805ee37748bf3bce1fd2594772
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Fri Dec 20 16:51:35 2013 +0100

fdo#72204 RTF import: fix crash on rotated, but not imported groupshape

In case the groupshape contains textboxes and they contain table, we
don't import the groupshape itself, just the children, as drawinglayer
rectangles wouldn't handle tables.

If that's the case, don't try to apply properties on the groupshape, as
that would crash (the Writer drawpage implements XShapes, but not the
XShape interface).

Change-Id: Ie34039170314b772dd050eb354681cfaec61c1fa
(cherry picked from commit 3e199f81473d1f85a75238ac03d38a220f3ab818)

diff --git a/sw/qa/core/data/rtf/pass/fdo72204.rtf 
b/sw/qa/core/data/rtf/pass/fdo72204.rtf
new file mode 100644
index 000..052a639
--- /dev/null
+++ b/sw/qa/core/data/rtf/pass/fdo72204.rtf
@@ -0,0 +1,48 @@
+{\rtf1
+{\shpgrp
+{\*\shpinst\shpleft-950\shptop156\shpright1583\shpbottom2942\shpfhdr0\shpbxcolumn\shpbxignore\shpbypara\shpbyignore\shpwr3\shpwrk0\shpfblwtxt0\shpz0\shplid1036
+{\sp{\sn groupLeft}{\sv 1621}}
+{\sp{\sn groupTop}{\sv 2621}}
+{\sp{\sn groupRight}{\sv 4154}}
+{\sp{\sn groupBottom}{\sv 5407}}
+{\sp{\sn rotation}{\sv 0}}
+{\shp
+{\*\shpinst\shplid1037
+{\sp{\sn relLeft}{\sv 1621}}
+{\sp{\sn relTop}{\sv 2621}}
+{\sp{\sn relRight}{\sv 4154}}
+{\sp{\sn relBottom}{\sv 5092}}
+{\sp{\sn shapeType}{\sv 202}}
+{\shptxt \ltrpar \trowd 
+\clbrdrt\brdrtbl \clbrdrl\brdrtbl \clbrdrb\brdrtbl \clbrdrr\brdrtbl \cellx567
+\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10 \clbrdrb\brdrs\brdrw10 
\clbrdrr\brdrs\brdrw10 \cellx1134\clbrdrt\brdrtbl \clbrdrl\brdrnone 
\clbrdrb\brdrtbl \clbrdrr\brdrtbl 
+\cellx1701\clbrdrt\brdrtbl \clbrdrl\brdrtbl \clbrdrb\brdrtbl \clbrdrr\brdrtbl 
\cltxlrtb\cellx2268\pard\plain \ltrpar\ql 
+\intbl \rtlch \afs22\alang1025 \ltrch 
\lang1038\langfe1033\loch\hich\dbch\cgrid\langnp1038\langfenp1033 
+{\rtlch \ltrch 
+\hich\dbch\loch\f37 a)\cell }
+\pard \ltrpar\qc \intbl 
+{\rtlch \ltrch 
+\cell \cell \cell }
+\pard \ltrpar\ql \intbl 
+{\rtlch \ltrch \trowd 
+\clbrdrt\brdrtbl \clbrdrl\brdrtbl \clbrdrb\brdrtbl \clbrdrr\brdrtbl \cellx567
+\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10 \clbrdrb\brdrs\brdrw10 
\clbrdrr\brdrs\brdrw10 \cellx1134\clbrdrt\brdrtbl \clbrdrl\brdrnone 
\clbrdrb\brdrtbl \clbrdrr\brdrtbl 
+\cellx1701\clbrdrt\brdrtbl \clbrdrl\brdrtbl \clbrdrb\brdrtbl \clbrdrr\brdrtbl 
\cltxlrtb\cellx2268\row }
+\trowd \clbrdrt\brdrtbl \clbrdrl\brdrtbl \clbrdrb\brdrtbl \clbrdrr\brdrtbl 
\cellx567
+\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10 \clbrdrb\brdrs\brdrw10 
\clbrdrr\brdrs\brdrw10 \cellx1134\clbrdrt\brdrtbl \clbrdrl\brdrnone 
\clbrdrb\brdrtbl \clbrdrr\brdrtbl 
+\cellx1701\clbrdrt\brdrtbl \clbrdrl\brdrtbl \clbrdrb\brdrtbl \clbrdrr\brdrtbl 
\cltxlrtb\cellx2268\pard \ltrpar\qc 
+\intbl 
+{\rtlch \ltrch \cell \cell \cell \cell }
+\pard \ltrpar\ql \intbl 
+{\rtlch \ltrch \trowd 
+\clbrdrt\brdrtbl \clbrdrl\brdrtbl \clbrdrb\brdrtbl \clbrdrr\brdrtbl \cellx567
+\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10 \clbrdrb\brdrs\brdrw10 
\clbrdrr\brdrs\brdrw10 \cellx1134\clbrdrt\brdrtbl \clbrdrl\brdrnone 
\clbrdrb\brdrtbl \clbrdrr\brdrtbl 
+\cellx1701\clbrdrt\brdrtbl \clbrdrl\brdrtbl \clbrdrb\brdrtbl \clbrdrr\brdrtbl 
\cltxlrtb\cellx2268\row }
+\pard \ltrpar\ql \itap0\par
+}
+}
+}
+}
+}
+\par
+}
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx 
b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 4ee..3d9df8b 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -704,7 +704,9 @@ void RTFSdrImport::append(OUString aKey, OUString aValue)
 
 void RTFSdrImport::appendGroupProperty(OUString aKey, OUString aValue)
 {
-applyProperty(uno::Referencedrawing::XShape(m_aParents.top(), 
uno::UNO_QUERY), aKey, aValue);
+uno::Referencedrawing::XShape xShape(m_aParents.top(), uno::UNO_QUERY);
+if (xShape.is())
+applyProperty(xShape, aKey, aValue);
 }
 
 } // namespace rtftok
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-12-20 Thread Jacobo Aragunde Pérez

 sw/source/filter/ww8/docxattributeoutput.cxx |  262 +++
 sw/source/filter/ww8/docxattributeoutput.hxx |3 
 2 files changed, 116 insertions(+), 149 deletions(-)

New commits:
commit 7b073527da7dce314e14dba7b34245db3f0b5ae1
Author: Jacobo Aragunde PÃ©rez jaragu...@igalia.com
Date:   Fri Dec 20 12:32:11 2013 +0100

sw: small code refactor

Created method DocxAttributeOutput::pushToAttrList which encapsulates
a piece of code that was widely repeated in that class:

  if( some attribute list does not exist )
  create the list

  push some value to the list
  push some other value to the list

Change-Id: Ia648802f5237bd7c97bf225d33b305dbef1b72dd

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 7daf788..130e0cc 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4308,10 +4308,7 @@ void DocxAttributeOutput::CharColor( const SvxColorItem 
rColor )
 
 aColorString = msfilter::util::ConvertColor( aColor );
 
-if( !m_pColorAttrList )
-m_pColorAttrList = m_pSerializer-createAttrList();
-
-m_pColorAttrList-add( FSNS( XML_w, XML_val ), aColorString.getStr() );
+pushToAttrList( m_pColorAttrList, FSNS( XML_w, XML_val ), 
aColorString.getStr() );
 }
 
 void DocxAttributeOutput::CharContour( const SvxContourItem rContour )
@@ -4380,13 +4377,12 @@ void DocxAttributeOutput::CharEscapement( const 
SvxEscapementItem rEscapement )
 
 void DocxAttributeOutput::CharFont( const SvxFontItem rFont)
 {
-if (!m_pFontsAttrList)
-m_pFontsAttrList = m_pSerializer-createAttrList();
 GetExport().GetId( rFont ); // ensure font info is written to fontTable.xml
 OUString sFontName(rFont.GetFamilyName());
 OString sFontNameUtf8 = OUStringToOString(sFontName, 
RTL_TEXTENCODING_UTF8);
-m_pFontsAttrList-add(FSNS(XML_w, XML_ascii), sFontNameUtf8);
-m_pFontsAttrList-add(FSNS(XML_w, XML_hAnsi), sFontNameUtf8);
+pushToAttrList(m_pFontsAttrList, 2,
+FSNS(XML_w, XML_ascii), sFontNameUtf8.getStr(),
+FSNS(XML_w, XML_hAnsi), sFontNameUtf8.getStr() );
 }
 
 void DocxAttributeOutput::CharFontSize( const SvxFontHeightItem rFontSize)
@@ -4413,9 +4409,6 @@ void DocxAttributeOutput::CharKerning( const 
SvxKerningItem rKerning )
 
 void DocxAttributeOutput::CharLanguage( const SvxLanguageItem rLanguage )
 {
-if (!m_pCharLangAttrList)
-m_pCharLangAttrList = m_pSerializer-createAttrList();
-
 OString aLanguageCode( OUStringToOString(
 LanguageTag( rLanguage.GetLanguage()).getBcp47(),
 RTL_TEXTENCODING_UTF8));
@@ -4423,13 +4416,13 @@ void DocxAttributeOutput::CharLanguage( const 
SvxLanguageItem rLanguage )
 switch ( rLanguage.Which() )
 {
 case RES_CHRATR_LANGUAGE:
-m_pCharLangAttrList-add(FSNS(XML_w, XML_val), aLanguageCode);
+pushToAttrList(m_pCharLangAttrList, FSNS(XML_w, XML_val), 
aLanguageCode.getStr());
 break;
 case RES_CHRATR_CJK_LANGUAGE:
-m_pCharLangAttrList-add(FSNS(XML_w, XML_eastAsia), aLanguageCode);
+pushToAttrList(m_pCharLangAttrList, FSNS(XML_w, XML_eastAsia), 
aLanguageCode.getStr());
 break;
 case RES_CHRATR_CTL_LANGUAGE:
-m_pCharLangAttrList-add(FSNS(XML_w, XML_bidi), aLanguageCode);
+pushToAttrList(m_pCharLangAttrList, FSNS(XML_w, XML_bidi), 
aLanguageCode.getStr());
 break;
 }
 }
@@ -4540,11 +4533,9 @@ void DocxAttributeOutput::CharBackground( const 
SvxBrushItem rBrush )
 
 void DocxAttributeOutput::CharFontCJK( const SvxFontItem rFont )
 {
-if (!m_pFontsAttrList)
-m_pFontsAttrList = m_pSerializer-createAttrList();
 OUString sFontName(rFont.GetFamilyName());
 OString sFontNameUtf8 = OUStringToOString(sFontName, 
RTL_TEXTENCODING_UTF8);
-m_pFontsAttrList-add(FSNS(XML_w, XML_eastAsia), sFontNameUtf8);
+pushToAttrList(m_pFontsAttrList, FSNS(XML_w, XML_eastAsia), 
sFontNameUtf8.getStr());
 }
 
 void DocxAttributeOutput::CharPostureCJK( const SvxPostureItem rPosture )
@@ -4565,11 +4556,9 @@ void DocxAttributeOutput::CharWeightCJK( const 
SvxWeightItem rWeight )
 
 void DocxAttributeOutput::CharFontCTL( const SvxFontItem rFont )
 {
-if (!m_pFontsAttrList)
-m_pFontsAttrList = m_pSerializer-createAttrList();
 OUString sFontName(rFont.GetFamilyName());
 OString sFontNameUtf8 = OUStringToOString(sFontName, 
RTL_TEXTENCODING_UTF8);
-m_pFontsAttrList-add(FSNS(XML_w, XML_cs), sFontNameUtf8);
+pushToAttrList(m_pFontsAttrList, FSNS(XML_w, XML_cs), 
sFontNameUtf8.getStr());
 
 }
 
@@ -4595,13 +4584,10 @@ void DocxAttributeOutput::CharRotate( const 
SvxCharRotateItem rRotate)
 if ( !rRotate.GetValue() || m_bBtLr || m_bFrameBtLr)
 return;
 
-if (!m_pEastAsianLayoutAttrList)
-m_pEastAsianLayoutAttrList =

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

 sc/source/filter/xml/xmlstyle.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3743df7d2b7fccbc0cdbae268f29782e565103b5
Author: Eike Rathke er...@redhat.com
Date:   Fri Dec 20 18:28:54 2013 +0100

resolved fdo#72922 write loext:vertical-justify

... and also read style:vertical-justify

Change-Id: I6c8d2464754485e476216317371e0e2995b5305e

diff --git a/sc/source/filter/xml/xmlstyle.cxx 
b/sc/source/filter/xml/xmlstyle.cxx
index da3e882..c36708d 100644
--- a/sc/source/filter/xml/xmlstyle.cxx
+++ b/sc/source/filter/xml/xmlstyle.cxx
@@ -109,8 +109,8 @@ const XMLPropertyMapEntry aXMLScCellStylesProperties[] =
 MAP( UserDefinedAttributes, XML_NAMESPACE_TEXT, XML_XMLNS, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_ATTRIBUTE_CONTAINER | MID_FLAG_SPECIAL_ITEM, 
0 ),
 MAP( ValidationXML, XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATION, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BUILDIN_CMP_ONLY, CTF_SC_VALIDATION ),
 MAP( VertJustify, XML_NAMESPACE_STYLE, XML_VERTICAL_ALIGN, 
XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_VERTJUSTIFY, 0),
-MAP_EXT( SC_UNONAME_CELLVJUS_METHOD, XML_NAMESPACE_STYLE, 
XML_VERTICAL_JUSTIFY, XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_VERTJUSTIFY_METHOD, 
0 ),   // proposed ODF 1.2+
-MAP_EXT_I( SC_UNONAME_CELLVJUS_METHOD, XML_NAMESPACE_LO_EXT, 
XML_VERTICAL_JUSTIFY, XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_VERTJUSTIFY_METHOD, 
0 ),// extension namespace
+MAP_EXT_I( SC_UNONAME_CELLVJUS_METHOD, XML_NAMESPACE_STYLE, 
XML_VERTICAL_JUSTIFY, XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_VERTJUSTIFY_METHOD, 
0 ), // proposed ODF 1.2+
+MAP_EXT( SC_UNONAME_CELLVJUS_METHOD, XML_NAMESPACE_LO_EXT, 
XML_VERTICAL_JUSTIFY, XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_VERTJUSTIFY_METHOD, 
0 ),  // extension namespace
 MAP_END()
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 50350] Setup source and symbol server for Windows

2013-12-20 Thread bugzilla-daemon

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

--- Comment #8 from bfoman bfo.bugm...@spamgourmet.com ---
Starting with 4.2.0rc1 you can get pdb files for debugging the release builds.
The symbol server's URL is:

http://dev-downloads.libreoffice.org/symstore/symbols

For daily debug builds use
http://dev-builds.libreoffice.org/daily/master/Win-x86@39/current to get a
debug build with the symbols available at:

http://dev-builds.libreoffice.org/daily/master/Win-x86@39/symbols

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

[Libreoffice-commits] core.git: Branch 'private/kohei/4-2-data-stream-staging' - sc/source

 sc/source/ui/docshell/datastream.cxx |   11 ++-
 1 file changed, 2 insertions(+), 9 deletions(-)

New commits:
commit 9ac968ebe8743ffedf6c8114826711859d0563f8
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Fri Dec 20 12:56:17 2013 -0500

Call Yield() to unblock the main thread when refreshing.

Also, we don't seem to need this solar mutex locking and checking for
needs repaint flag here anymore, and not having these make the streaming
much faster esp on Windows.

Change-Id: I6e8ae82e5d986492ac576d28f11e2afffe954bc2

diff --git a/sc/source/ui/docshell/datastream.cxx 
b/sc/source/ui/docshell/datastream.cxx
index 8f6f501..27a5991 100644
--- a/sc/source/ui/docshell/datastream.cxx
+++ b/sc/source/ui/docshell/datastream.cxx
@@ -65,15 +65,11 @@ private:
 {
 while (!mbTerminate)
 {
-// wait for a small amount of time, so that
-// painting methods have a chance to be called.
-// And also to make UI more responsive.
-TimeValue const aTime = {0, 10};
 maStart.wait();
 maStart.reset();
 if (!mbTerminate)
 while (mpDataStream-ImportData())
-wait(aTime);
+;
 };
 }
 };
@@ -352,6 +348,7 @@ void DataStream::SetRefreshOnEmptyLine( bool bVal )
 void DataStream::Refresh()
 {
 // Hard recalc will repaint the grid area.
+Application::Yield();
 mpDocShell-DoHardRecalc(true);
 mpDocShell-SetDocumentModified(true);
 
@@ -516,14 +513,10 @@ void DataStream::Text2Doc() {}
 
 bool DataStream::ImportData()
 {
-SolarMutexGuard aGuard;
 if (!mbValuesInLine)
 // We no longer support this mode. To be deleted later.
 return false;
 
-if (ScDocShell::GetViewData()-GetViewShell()-NeedsRepaint())
-return mbRunning;
-
 Text2Doc();
 return mbRunning;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/kohei/4-2-data-stream-staging' - sc/source

 sc/source/ui/docshell/datastream.cxx |   11 ++-
 1 file changed, 2 insertions(+), 9 deletions(-)

New commits:
commit 1bf1dfdfba7ddadd8db3dbd37a3511f67b82bf43
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Fri Dec 20 12:56:17 2013 -0500

Call Yield() to unblock the main thread when refreshing.

Also, we don't seem to need this solar mutex locking and checking for
needs repaint flag here anymore, and not having these make the streaming
much faster esp on Windows.

Change-Id: I6e8ae82e5d986492ac576d28f11e2afffe954bc2

diff --git a/sc/source/ui/docshell/datastream.cxx 
b/sc/source/ui/docshell/datastream.cxx
index 931395d..8f78c9c 100644
--- a/sc/source/ui/docshell/datastream.cxx
+++ b/sc/source/ui/docshell/datastream.cxx
@@ -65,15 +65,11 @@ private:
 {
 while (!mbTerminate)
 {
-// wait for a small amount of time, so that
-// painting methods have a chance to be called.
-// And also to make UI more responsive.
-TimeValue const aTime = {0, 10};
 maStart.wait();
 maStart.reset();
 if (!mbTerminate)
 while (mpDataStream-ImportData())
-wait(aTime);
+;
 };
 }
 };
@@ -352,6 +348,7 @@ void DataStream::SetRefreshOnEmptyLine( bool bVal )
 void DataStream::Refresh()
 {
 // Hard recalc will repaint the grid area.
+Application::Yield();
 mpDocShell-DoHardRecalc(true);
 mpDocShell-SetDocumentModified(true);
 
@@ -512,14 +509,10 @@ void DataStream::Text2Doc() {}
 
 bool DataStream::ImportData()
 {
-SolarMutexGuard aGuard;
 if (!mbValuesInLine)
 // We no longer support this mode. To be deleted later.
 return false;
 
-if (ScDocShell::GetViewData()-GetViewShell()-NeedsRepaint())
-return mbRunning;
-
 Text2Doc();
 return mbRunning;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/source/ui/docshell/datastream.cxx |   11 ++-
 1 file changed, 2 insertions(+), 9 deletions(-)

New commits:
commit c3bd435387ffbc6ae3c5a4861ac419d0a7092807
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Fri Dec 20 12:56:17 2013 -0500

Call Yield() to unblock the main thread when refreshing.

Also, we don't seem to need this solar mutex locking and checking for
needs repaint flag here anymore, and not having these make the streaming
much faster esp on Windows.

Change-Id: I6e8ae82e5d986492ac576d28f11e2afffe954bc2

diff --git a/sc/source/ui/docshell/datastream.cxx 
b/sc/source/ui/docshell/datastream.cxx
index 493b922..a06354e 100644
--- a/sc/source/ui/docshell/datastream.cxx
+++ b/sc/source/ui/docshell/datastream.cxx
@@ -65,15 +65,11 @@ private:
 {
 while (!mbTerminate)
 {
-// wait for a small amount of time, so that
-// painting methods have a chance to be called.
-// And also to make UI more responsive.
-TimeValue const aTime = {0, 10};
 maStart.wait();
 maStart.reset();
 if (!mbTerminate)
 while (mpDataStream-ImportData())
-wait(aTime);
+;
 };
 }
 };
@@ -352,6 +348,7 @@ void DataStream::SetRefreshOnEmptyLine( bool bVal )
 void DataStream::Refresh()
 {
 // Hard recalc will repaint the grid area.
+Application::Yield();
 mpDocShell-DoHardRecalc(true);
 mpDocShell-SetDocumentModified(true);
 
@@ -513,14 +510,10 @@ void DataStream::Text2Doc() {}
 
 bool DataStream::ImportData()
 {
-SolarMutexGuard aGuard;
 if (!mbValuesInLine)
 // We no longer support this mode. To be deleted later.
 return false;
 
-if (ScDocShell::GetViewData()-GetViewShell()-NeedsRepaint())
-return mbRunning;
-
 Text2Doc();
 return mbRunning;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/source/ui/docshell/datastream.cxx |   11 ++-
 1 file changed, 2 insertions(+), 9 deletions(-)

New commits:
commit e33d8796086a56a7e3face18016d731b1d0fad6f
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Fri Dec 20 12:56:17 2013 -0500

Call Yield() to unblock the main thread when refreshing.

Also, we don't seem to need this solar mutex locking and checking for
needs repaint flag here anymore, and not having these make the streaming
much faster esp on Windows.

Change-Id: I6e8ae82e5d986492ac576d28f11e2afffe954bc2
(cherry picked from commit c3bd435387ffbc6ae3c5a4861ac419d0a7092807)

diff --git a/sc/source/ui/docshell/datastream.cxx 
b/sc/source/ui/docshell/datastream.cxx
index 931395d..8f78c9c 100644
--- a/sc/source/ui/docshell/datastream.cxx
+++ b/sc/source/ui/docshell/datastream.cxx
@@ -65,15 +65,11 @@ private:
 {
 while (!mbTerminate)
 {
-// wait for a small amount of time, so that
-// painting methods have a chance to be called.
-// And also to make UI more responsive.
-TimeValue const aTime = {0, 10};
 maStart.wait();
 maStart.reset();
 if (!mbTerminate)
 while (mpDataStream-ImportData())
-wait(aTime);
+;
 };
 }
 };
@@ -352,6 +348,7 @@ void DataStream::SetRefreshOnEmptyLine( bool bVal )
 void DataStream::Refresh()
 {
 // Hard recalc will repaint the grid area.
+Application::Yield();
 mpDocShell-DoHardRecalc(true);
 mpDocShell-SetDocumentModified(true);
 
@@ -512,14 +509,10 @@ void DataStream::Text2Doc() {}
 
 bool DataStream::ImportData()
 {
-SolarMutexGuard aGuard;
 if (!mbValuesInLine)
 // We no longer support this mode. To be deleted later.
 return false;
 
-if (ScDocShell::GetViewData()-GetViewShell()-NeedsRepaint())
-return mbRunning;
-
 Text2Doc();
 return mbRunning;
 }
___
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

 vcl/source/gdi/outdev3.cxx |   22 +-
 1 file changed, 17 insertions(+), 5 deletions(-)

New commits:
commit 8fb0aff43cc0f7d25536bb5c7382dd54970fce36
Author: Jan Holesovsky ke...@collabora.com
Date:   Fri Dec 20 19:33:03 2013 +0100

hidpi: Let's be brave  always paint odd heights with Hi-DPI ;-)

Change-Id: Ib374d5636a296663c8dde71827f1bca96f545e51

diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index ce5a9e6..3feb9bf 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -5309,13 +5309,13 @@ void OutputDevice::DrawWaveLine( const Point 
rStartPos, const Point rEndPos,
 
 if (mnDPIScaleFactor  1)
 {
-nStartY++; //Shift down an additional pixel to create more visual 
separation.
 nWaveHeight *= mnDPIScaleFactor;
 
-//5 pixels looks better than 6.
-if (mnDPIScaleFactor == 2  nWaveHeight == 6)
+// odd heights look better than even
+if (mnDPIScaleFactor % 2 == 0)
 {
-nWaveHeight = 5;
+nStartY++; // Shift down an additional pixel to create more 
visual separation.
+nWaveHeight--;
 }
 }
 }
commit c63324e0fdcfcaa21f48bdbae289954eee5922aa
Author: Keith Curtis keit...@gmail.com
Date:   Fri Dec 20 19:27:10 2013 +0100

hidpi: Nicer painting of the waved lines.

Change-Id: I8773b47967bc1aa8cf33b9a1edc4f826291d3554

diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 99b09db9..ce5a9e6 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -5306,6 +5306,18 @@ void OutputDevice::DrawWaveLine( const Point rStartPos, 
const Point rEndPos,
 nWaveHeight = 3;
 nStartY++;
 nEndY++;
+
+if (mnDPIScaleFactor  1)
+{
+nStartY++; //Shift down an additional pixel to create more visual 
separation.
+nWaveHeight *= mnDPIScaleFactor;
+
+//5 pixels looks better than 6.
+if (mnDPIScaleFactor == 2  nWaveHeight == 6)
+{
+nWaveHeight = 5;
+}
+}
 }
 else if( nStyle == WAVE_SMALL )
 {
@@ -5316,13 +5328,13 @@ void OutputDevice::DrawWaveLine( const Point 
rStartPos, const Point rEndPos,
 else // WAVE_FLAT
 nWaveHeight = 1;
 
- // #109280# make sure the waveline does not exceed the descent to avoid 
paint problems
- ImplFontEntry* pFontEntry = mpFontEntry;
- if( nWaveHeight  pFontEntry-maMetric.mnWUnderlineSize )
- nWaveHeight = pFontEntry-maMetric.mnWUnderlineSize;
+// #109280# make sure the waveline does not exceed the descent to avoid 
paint problems
+ImplFontEntry* pFontEntry = mpFontEntry;
+if( nWaveHeight  pFontEntry-maMetric.mnWUnderlineSize )
+nWaveHeight = pFontEntry-maMetric.mnWUnderlineSize;
 
 ImplDrawWaveLine(nStartX, nStartY, 0, 0,
-nEndX-nStartX, nWaveHeight * mnDPIScaleFactor,
+nEndX-nStartX, nWaveHeight,
 mnDPIScaleFactor, nOrientation, GetLineColor());
 
 if( mpAlphaVDev )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: minutes of ESC call ...

2013-12-20 Thread Florian Effenberger


Hi,

Miklos Vajna wrote on 2013-12-20 17:19:

Florian, in [1], asked for an SSH key so I can get access to the

script machine. I sent a mail in early 11th of Dec with my public
key to David O, Norbert, Florian and CCed Bjoern.


sorry for the delay. IMHO, it has been resolved in the meantime, you 
should have received a mail two hours ago or so :) Can you confirm?


Florian



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

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

2013-12-20 Thread Jacobo Aragunde Pérez

 sw/source/filter/ww8/docxattributeoutput.cxx |  262 +++
 sw/source/filter/ww8/docxattributeoutput.hxx |3 
 2 files changed, 149 insertions(+), 116 deletions(-)

New commits:
commit 1c1980728e6eb0ec65745b824db4f20502b5e9ae
Author: Jacobo Aragunde PÃ©rez jaragu...@igalia.com
Date:   Fri Dec 20 19:44:41 2013 +0100

Revert sw: small code refactor

This reverts commit 7b073527da7dce314e14dba7b34245db3f0b5ae1.

It seems to require additional testing in Windows so I'm taking it
back at the moment.

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 130e0cc..7daf788 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4308,7 +4308,10 @@ void DocxAttributeOutput::CharColor( const SvxColorItem 
rColor )
 
 aColorString = msfilter::util::ConvertColor( aColor );
 
-pushToAttrList( m_pColorAttrList, FSNS( XML_w, XML_val ), 
aColorString.getStr() );
+if( !m_pColorAttrList )
+m_pColorAttrList = m_pSerializer-createAttrList();
+
+m_pColorAttrList-add( FSNS( XML_w, XML_val ), aColorString.getStr() );
 }
 
 void DocxAttributeOutput::CharContour( const SvxContourItem rContour )
@@ -4377,12 +4380,13 @@ void DocxAttributeOutput::CharEscapement( const 
SvxEscapementItem rEscapement )
 
 void DocxAttributeOutput::CharFont( const SvxFontItem rFont)
 {
+if (!m_pFontsAttrList)
+m_pFontsAttrList = m_pSerializer-createAttrList();
 GetExport().GetId( rFont ); // ensure font info is written to fontTable.xml
 OUString sFontName(rFont.GetFamilyName());
 OString sFontNameUtf8 = OUStringToOString(sFontName, 
RTL_TEXTENCODING_UTF8);
-pushToAttrList(m_pFontsAttrList, 2,
-FSNS(XML_w, XML_ascii), sFontNameUtf8.getStr(),
-FSNS(XML_w, XML_hAnsi), sFontNameUtf8.getStr() );
+m_pFontsAttrList-add(FSNS(XML_w, XML_ascii), sFontNameUtf8);
+m_pFontsAttrList-add(FSNS(XML_w, XML_hAnsi), sFontNameUtf8);
 }
 
 void DocxAttributeOutput::CharFontSize( const SvxFontHeightItem rFontSize)
@@ -4409,6 +4413,9 @@ void DocxAttributeOutput::CharKerning( const 
SvxKerningItem rKerning )
 
 void DocxAttributeOutput::CharLanguage( const SvxLanguageItem rLanguage )
 {
+if (!m_pCharLangAttrList)
+m_pCharLangAttrList = m_pSerializer-createAttrList();
+
 OString aLanguageCode( OUStringToOString(
 LanguageTag( rLanguage.GetLanguage()).getBcp47(),
 RTL_TEXTENCODING_UTF8));
@@ -4416,13 +4423,13 @@ void DocxAttributeOutput::CharLanguage( const 
SvxLanguageItem rLanguage )
 switch ( rLanguage.Which() )
 {
 case RES_CHRATR_LANGUAGE:
-pushToAttrList(m_pCharLangAttrList, FSNS(XML_w, XML_val), 
aLanguageCode.getStr());
+m_pCharLangAttrList-add(FSNS(XML_w, XML_val), aLanguageCode);
 break;
 case RES_CHRATR_CJK_LANGUAGE:
-pushToAttrList(m_pCharLangAttrList, FSNS(XML_w, XML_eastAsia), 
aLanguageCode.getStr());
+m_pCharLangAttrList-add(FSNS(XML_w, XML_eastAsia), aLanguageCode);
 break;
 case RES_CHRATR_CTL_LANGUAGE:
-pushToAttrList(m_pCharLangAttrList, FSNS(XML_w, XML_bidi), 
aLanguageCode.getStr());
+m_pCharLangAttrList-add(FSNS(XML_w, XML_bidi), aLanguageCode);
 break;
 }
 }
@@ -4533,9 +4540,11 @@ void DocxAttributeOutput::CharBackground( const 
SvxBrushItem rBrush )
 
 void DocxAttributeOutput::CharFontCJK( const SvxFontItem rFont )
 {
+if (!m_pFontsAttrList)
+m_pFontsAttrList = m_pSerializer-createAttrList();
 OUString sFontName(rFont.GetFamilyName());
 OString sFontNameUtf8 = OUStringToOString(sFontName, 
RTL_TEXTENCODING_UTF8);
-pushToAttrList(m_pFontsAttrList, FSNS(XML_w, XML_eastAsia), 
sFontNameUtf8.getStr());
+m_pFontsAttrList-add(FSNS(XML_w, XML_eastAsia), sFontNameUtf8);
 }
 
 void DocxAttributeOutput::CharPostureCJK( const SvxPostureItem rPosture )
@@ -4556,9 +4565,11 @@ void DocxAttributeOutput::CharWeightCJK( const 
SvxWeightItem rWeight )
 
 void DocxAttributeOutput::CharFontCTL( const SvxFontItem rFont )
 {
+if (!m_pFontsAttrList)
+m_pFontsAttrList = m_pSerializer-createAttrList();
 OUString sFontName(rFont.GetFamilyName());
 OString sFontNameUtf8 = OUStringToOString(sFontName, 
RTL_TEXTENCODING_UTF8);
-pushToAttrList(m_pFontsAttrList, FSNS(XML_w, XML_cs), 
sFontNameUtf8.getStr());
+m_pFontsAttrList-add(FSNS(XML_w, XML_cs), sFontNameUtf8);
 
 }
 
@@ -4584,10 +4595,13 @@ void DocxAttributeOutput::CharRotate( const 
SvxCharRotateItem rRotate)
 if ( !rRotate.GetValue() || m_bBtLr || m_bFrameBtLr)
 return;
 
-pushToAttrList(m_pEastAsianLayoutAttrList, FSNS(XML_w, XML_vert), true);
+if (!m_pEastAsianLayoutAttrList)
+m_pEastAsianLayoutAttrList = m_pSerializer-createAttrList();
+OString sTrue((sal_Char *)true);
+

Re: [Libreoffice-qa] [ANN] LIbreOffice 4.2.0 RC1 available

2013-12-20 Thread M Henri Day

2013/12/20 Christian Lohmaier lohma...@googlemail.com

 Dear Community,

 The Document Foundation is pleased to announce the first release
 candidate of LibreOffice 4.2.0. The upcoming 4.2.0 will bring new
 features and lots of bugfixes. Check out
 https://wiki.documentfoundation.org/ReleaseNotes/4.2 for an
 (incomplete and work-in-progress) list of the new features.
 Please be aware that LibreOffice 4.2.0 RC1 is not been flagged as ready
 for production use yet, you should continue to use LibreOffice 4.1.4 for
 that.

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

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

 LibreOffice 4.2.0 RC1 is also available in a 64bit version for Mac OS
 X 10.8 (or newer)

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

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

   https://bugs.freedesktop.org

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


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

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

   http://www.libreoffice.org/get-involved/developers/

 translate LibreOffice to your language:

   http://wiki.documentfoundation.org/LibreOffice_Localization_Guide

 or help with funding our operations:

   http://donate.libreoffice.org/

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

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

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

 On behalf of the Community,

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


Once again, Christian, you LO developers seem to have done a fantastic job
! Kudos ! I really look forward to using this version, when it's come a bit
longer. As it is, I'm quite impressed (no pun intended) with 4.1.4.2...

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

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

 svx/source/tbxctrls/layctrl.cxx |   75 +++-
 1 file changed, 36 insertions(+), 39 deletions(-)

New commits:
commit 07c8b8f56f8f10315f47d5f3f1d2d7e7422569a8
Author: Jan Holesovsky ke...@collabora.com
Date:   Fri Dec 20 20:42:13 2013 +0100

hidpi: Some constants changed to member variables.

Change-Id: I14d43af872184487c2cea6acde746a0ed72b570d

diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index d519ddc3..d4cd594 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -59,17 +59,17 @@ private:
 Reference XFrame  mxFrame;
 OUString   maCommand;
 
-long TABLE_CELL_WIDTH;
-long TABLE_CELL_HEIGHT;
+static const long TABLE_CELLS_HORIZ = 10;
+static const long TABLE_CELLS_VERT = 15;
 
-const long TABLE_CELLS_HORIZ;
-const long TABLE_CELLS_VERT;
+long mnTableCellWidth;
+long mnTableCellHeight;
 
-long TABLE_POS_X;
-long TABLE_POS_Y;
+long mnTablePosX;
+long mnTablePosY;
 
-long TABLE_WIDTH;
-long TABLE_HEIGHT;
+long mnTableWidth;
+long mnTableHeight;
 
 DECL_LINK( SelectHdl, void * );
 
@@ -112,17 +112,14 @@ TableWindow::TableWindow( sal_uInt16 nSlotId, const 
OUString rCmd, const OUStri
 rTbx(rParentTbx),
 mxFrame( rFrame ),
 maCommand( rCmd ),
-TABLE_CELLS_HORIZ(10),
-TABLE_CELLS_VERT(15),
-TABLE_POS_X(2),
-TABLE_POS_Y(2)
+mnTablePosX(2),
+mnTablePosY(2)
 {
-TABLE_CELL_WIDTH  = 15 * GetDPIScaleFactor();
-TABLE_CELL_HEIGHT = 15 * GetDPIScaleFactor();
+mnTableCellWidth  = 15 * GetDPIScaleFactor();
+mnTableCellHeight = 15 * GetDPIScaleFactor();
 
-
-TABLE_WIDTH  = TABLE_POS_X + TABLE_CELLS_HORIZ*TABLE_CELL_WIDTH;
-TABLE_HEIGHT = TABLE_POS_Y + TABLE_CELLS_VERT*TABLE_CELL_HEIGHT;
+mnTableWidth  = mnTablePosX + TABLE_CELLS_HORIZ*mnTableCellWidth;
+mnTableHeight = mnTablePosY + TABLE_CELLS_VERT*mnTableCellHeight;
 
 const StyleSettings rStyles = 
Application::GetSettings().GetStyleSettings();
 svtools::ColorConfig aColorConfig;
@@ -141,13 +138,13 @@ TableWindow::TableWindow( sal_uInt16 nSlotId, const 
OUString rCmd, const OUStri
 
 SetText( rText );
 
-aTableButton.SetPosSizePixel( Point( TABLE_POS_X + TABLE_CELL_WIDTH, 
TABLE_HEIGHT + 5 ),
-Size( TABLE_WIDTH - TABLE_POS_X - 2*TABLE_CELL_WIDTH, 24 ) );
+aTableButton.SetPosSizePixel( Point( mnTablePosX + mnTableCellWidth, 
mnTableHeight + 5 ),
+Size( mnTableWidth - mnTablePosX - 2*mnTableCellWidth, 24 ) );
 aTableButton.SetText( SVX_RESSTR( RID_SVXSTR_MORE ) );
 aTableButton.SetClickHdl( LINK( this, TableWindow, SelectHdl ) );
 aTableButton.Show();
 
-SetOutputSizePixel( Size( TABLE_WIDTH + 3, TABLE_HEIGHT + 33 ) );
+SetOutputSizePixel( Size( mnTableWidth + 3, mnTableHeight + 33 ) );
 }
 
 // ---
@@ -171,8 +168,8 @@ void TableWindow::MouseMove( const MouseEvent rMEvt )
 Point aPos = rMEvt.GetPosPixel();
 Point aMousePos( aPos );
 
-long nNewCol = ( aMousePos.X() - TABLE_POS_X + TABLE_CELL_WIDTH ) / 
TABLE_CELL_WIDTH;
-long nNewLine = ( aMousePos.Y() - TABLE_POS_Y + TABLE_CELL_HEIGHT ) / 
TABLE_CELL_HEIGHT;
+long nNewCol = ( aMousePos.X() - mnTablePosX + mnTableCellWidth ) / 
mnTableCellWidth;
+long nNewLine = ( aMousePos.Y() - mnTablePosY + mnTableCellHeight ) / 
mnTableCellHeight;
 
 Update( nNewCol, nNewLine );
 }
@@ -263,33 +260,33 @@ void TableWindow::MouseButtonUp( const MouseEvent rMEvt )
 
 void TableWindow::Paint( const Rectangle )
 {
-const long nSelectionWidth = TABLE_POS_X + nCol*TABLE_CELL_WIDTH;
-const long nSelectionHeight = TABLE_POS_Y + nLine*TABLE_CELL_HEIGHT;
+const long nSelectionWidth = mnTablePosX + nCol*mnTableCellWidth;
+const long nSelectionHeight = mnTablePosY + nLine*mnTableCellHeight;
 
 // the non-selected parts of the table
 SetLineColor( aLineColor );
 SetFillColor( aFillColor );
-DrawRect( Rectangle( nSelectionWidth, TABLE_POS_Y, TABLE_WIDTH, 
nSelectionHeight ) );
-DrawRect( Rectangle( TABLE_POS_X, nSelectionHeight, nSelectionWidth, 
TABLE_HEIGHT ) );
-DrawRect( Rectangle( nSelectionWidth, nSelectionHeight, TABLE_WIDTH, 
TABLE_HEIGHT ) );
+DrawRect( Rectangle( nSelectionWidth, mnTablePosY, mnTableWidth, 
nSelectionHeight ) );
+DrawRect( Rectangle( mnTablePosX, nSelectionHeight, nSelectionWidth, 
mnTableHeight ) );
+DrawRect( Rectangle( nSelectionWidth, nSelectionHeight, mnTableWidth, 
mnTableHeight ) );
 
 // the selection
 if ( nCol  0  nLine  0 )
 {
 SetFillColor( aHighlightFillColor );
-DrawRect( Rectangle( TABLE_POS_X, TABLE_POS_Y,
+DrawRect( Rectangle( mnTablePosX, mnTablePosY,
 nSelectionWidth, nSelectionHeight ) );
 }
 
 // lines inside of the table
 SetLineColor( aLineColor );
 for ( long i = 1;

[ANN] ODF extensions and XMLPropertyMapEntry::mbImportOnly and XMLPropertySetMapper

Hi,

To be able to handle ODF extensions of properties more conveniently
I introduced the XMLPropertyMapEntry::mbImportOnly member variable and
an additional bool bForExport parameter to the XMLPropertySetMapper
ctor, which in order to create an export mapping is set to true and for
an import mapping to false.

Please see
https://wiki.documentfoundation.org/Development/ODF_Implementer_Notes#Extension_namespaces
for details and why and how to use.

The change is also in 4-2 and pending review for 4-1 at
https://gerrit.libreoffice.org/7144 to allow such things as
https://gerrit.libreoffice.org/7150

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Support the FSFE, care about Free Software! https://fsfe.org/support/?erack


pgpIRPreMx3Dk.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2013-12-20 Thread Douglas Mencken

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

New commits:
commit 8cdb1466d6f93bb93e33dc1ef6d5083b005bd73f
Author: Douglas Mencken dougmenc...@gmail.com
Date:   Fri Dec 20 07:40:19 2013 -0500

Can't use const_reverse_iterator here.

Fix build error:
no match for âoperator!=â in âit != std::vector_Tp, 
_Alloc::rend()
[with _Tp = rtl::OUString, _Alloc = std::allocatorrtl::OUString]()â

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

diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx
index 708f3c2..e6722c6 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.cxx
@@ -197,7 +197,7 @@ bool ImplImageTree::doLoadImage(
 if (pos != -1) {
 // find() uses a reverse iterator, so push in reverse order.
 std::vector OUString  aFallbacks( 
Application::GetSettings().GetUILanguageTag().getFallbackStrings( true));
-for (std::vector OUString ::const_reverse_iterator it( 
aFallbacks.rbegin());
+for (std::vector OUString ::reverse_iterator it( 
aFallbacks.rbegin());
 it != aFallbacks.rend(); ++it)
 {
 paths.push_back( getRealImageName( createPath(name, pos, *it) 
) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/kohei/4-2-data-stream-staging' - sc/source

 sc/source/ui/docshell/datastream.cxx |   13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 1a20db432914bd00b7eb642a285123dfa7bfaa7d
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Fri Dec 20 15:29:45 2013 -0500

Put all these back in...

Change-Id: If2168a57e0c77cf7fe85d66a6c6fd6a810d45035

diff --git a/sc/source/ui/docshell/datastream.cxx 
b/sc/source/ui/docshell/datastream.cxx
index 8f78c9c..c7f52e5 100644
--- a/sc/source/ui/docshell/datastream.cxx
+++ b/sc/source/ui/docshell/datastream.cxx
@@ -65,11 +65,15 @@ private:
 {
 while (!mbTerminate)
 {
+// wait for a small amount of time, so that
+// painting methods have a chance to be called.
+// And also to make UI more responsive.
+TimeValue const aTime = {0, 1000};
 maStart.wait();
 maStart.reset();
 if (!mbTerminate)
 while (mpDataStream-ImportData())
-;
+wait(aTime);
 };
 }
 };
@@ -347,8 +351,9 @@ void DataStream::SetRefreshOnEmptyLine( bool bVal )
 
 void DataStream::Refresh()
 {
-// Hard recalc will repaint the grid area.
 Application::Yield();
+
+// Hard recalc will repaint the grid area.
 mpDocShell-DoHardRecalc(true);
 mpDocShell-SetDocumentModified(true);
 
@@ -509,10 +514,14 @@ void DataStream::Text2Doc() {}
 
 bool DataStream::ImportData()
 {
+SolarMutexGuard aGuard;
 if (!mbValuesInLine)
 // We no longer support this mode. To be deleted later.
 return false;
 
+if (ScDocShell::GetViewData()-GetViewShell()-NeedsRepaint())
+return mbRunning;
+
 Text2Doc();
 return mbRunning;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [libreoffice-projects] [ANN] LIbreOffice 4.2.0 RC1 available

2013-12-20 Thread Jean Weber

Hi Christian,

I used the regular (32-bit) build, which the download page suggested,
and which I have always used. Should I be using the 64-bit build? I'll
try that today.

--Jean


On Sat, Dec 21, 2013 at 1:38 AM, Christian Lohmaier
lohma...@googlemail.com wrote:
 Hi Jean,

 On Fri, Dec 20, 2013 at 6:24 AM, Jean Weber jeanwe...@gmail.com wrote:
 Mac OS X 10.9. Getting error message when attempting to start (open)
 the app after installing: LibreOffice.app is damaged and can't be
 opened. You should move it to the trash.

 Ah, too bad :-(

 As you're on 10.9 - did you use the 64bit build?

 This problem also occured with the Beta2, and Norbert said he thought
 the problem was with code-signing of non-release build.

 Yeah, that is what we all hoped...

 Bug 71884. He
 fixed it by replacing with unsigned file, which worked fine.

 Well, not really fixed, as that then also makes users unable to
 directly open LibreOffice package, they'd have to use the
 contextmenu...

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

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

 sc/source/ui/docshell/datastream.cxx |   13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

New commits:
commit f2a3848bee3f3deeb9dde43de51737cbdde84018
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Fri Dec 20 15:29:45 2013 -0500

Put all these back in...

Change-Id: If2168a57e0c77cf7fe85d66a6c6fd6a810d45035

diff --git a/sc/source/ui/docshell/datastream.cxx 
b/sc/source/ui/docshell/datastream.cxx
index a06354e..d43fdeb 100644
--- a/sc/source/ui/docshell/datastream.cxx
+++ b/sc/source/ui/docshell/datastream.cxx
@@ -65,11 +65,15 @@ private:
 {
 while (!mbTerminate)
 {
+// wait for a small amount of time, so that
+// painting methods have a chance to be called.
+// And also to make UI more responsive.
+TimeValue const aTime = {0, 1000};
 maStart.wait();
 maStart.reset();
 if (!mbTerminate)
 while (mpDataStream-ImportData())
-;
+wait(aTime);
 };
 }
 };
@@ -347,8 +351,9 @@ void DataStream::SetRefreshOnEmptyLine( bool bVal )
 
 void DataStream::Refresh()
 {
-// Hard recalc will repaint the grid area.
 Application::Yield();
+
+// Hard recalc will repaint the grid area.
 mpDocShell-DoHardRecalc(true);
 mpDocShell-SetDocumentModified(true);
 
@@ -510,10 +515,14 @@ void DataStream::Text2Doc() {}
 
 bool DataStream::ImportData()
 {
+SolarMutexGuard aGuard;
 if (!mbValuesInLine)
 // We no longer support this mode. To be deleted later.
 return false;
 
+if (ScDocShell::GetViewData()-GetViewShell()-NeedsRepaint())
+return mbRunning;
+
 Text2Doc();
 return mbRunning;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/source/ui/docshell/datastream.cxx |   13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 564b2831090cf997b47e7df2e4bd1b0068fade97
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Fri Dec 20 15:29:45 2013 -0500

Put all these back in...

Change-Id: If2168a57e0c77cf7fe85d66a6c6fd6a810d45035
(cherry picked from commit f2a3848bee3f3deeb9dde43de51737cbdde84018)

diff --git a/sc/source/ui/docshell/datastream.cxx 
b/sc/source/ui/docshell/datastream.cxx
index 8f78c9c..c7f52e5 100644
--- a/sc/source/ui/docshell/datastream.cxx
+++ b/sc/source/ui/docshell/datastream.cxx
@@ -65,11 +65,15 @@ private:
 {
 while (!mbTerminate)
 {
+// wait for a small amount of time, so that
+// painting methods have a chance to be called.
+// And also to make UI more responsive.
+TimeValue const aTime = {0, 1000};
 maStart.wait();
 maStart.reset();
 if (!mbTerminate)
 while (mpDataStream-ImportData())
-;
+wait(aTime);
 };
 }
 };
@@ -347,8 +351,9 @@ void DataStream::SetRefreshOnEmptyLine( bool bVal )
 
 void DataStream::Refresh()
 {
-// Hard recalc will repaint the grid area.
 Application::Yield();
+
+// Hard recalc will repaint the grid area.
 mpDocShell-DoHardRecalc(true);
 mpDocShell-SetDocumentModified(true);
 
@@ -509,10 +514,14 @@ void DataStream::Text2Doc() {}
 
 bool DataStream::ImportData()
 {
+SolarMutexGuard aGuard;
 if (!mbValuesInLine)
 // We no longer support this mode. To be deleted later.
 return false;
 
+if (ScDocShell::GetViewData()-GetViewShell()-NeedsRepaint())
+return mbRunning;
+
 Text2Doc();
 return mbRunning;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-12-20 Thread Matúš Kukan

 svx/util/svx.component |   18 --
 svx/util/svxcore.component |   18 ++
 2 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit 090674dcb085cd41f4628e4f07c9a2268a18e862
Author: MatÃºÅ¡ Kukan matus.ku...@collabora.com
Date:   Fri Dec 20 21:33:17 2013 +0100

These services are in fact implemented in svxcore library.

Change-Id: If260a6256a29f983e436032ef03ba36daa4ed78d

diff --git a/svx/util/svx.component b/svx/util/svx.component
index c5e609f..848b28e 100644
--- a/svx/util/svx.component
+++ b/svx/util/svx.component
@@ -19,28 +19,10 @@
 
 component loader=com.sun.star.loader.SharedLibrary environment=@CPPU_ENV@
 xmlns=http://openoffice.org/2010/uno-components;
-  implementation name=com.sun.star.comp.Draw.GraphicExporter
-  
constructor=com_sun_star_comp_Draw_GraphicExporter_implementation_getFactory
-service name=com.sun.star.drawing.GraphicExportFilter/
-  /implementation
-  implementation name=com.sun.star.comp.Svx.GraphicExportHelper
-  
constructor=com_sun_star_comp_Svx_GraphicExportHelper_implementation_getFactory
-service name=com.sun.star.document.BinaryStreamResolver/
-service name=com.sun.star.document.GraphicObjectResolver/
-  /implementation
-  implementation name=com.sun.star.comp.Svx.GraphicImportHelper
-  
constructor=com_sun_star_comp_Svx_GraphicImportHelper_implementation_getFactory
-service name=com.sun.star.document.BinaryStreamResolver/
-service name=com.sun.star.document.GraphicObjectResolver/
-  /implementation
   implementation name=com.sun.star.comp.gallery.GalleryThemeProvider
   
constructor=com_sun_star_comp_gallery_GalleryThemeProvider_implementation_getFactory
 service name=com.sun.star.gallery.GalleryThemeProvider/
   /implementation
-  implementation name=com.sun.star.comp.graphic.PrimitiveFactory2D
-  
constructor=com_sun_star_comp_graphic_PrimitiveFactory2D_implementation_getFactory
-service name=com.sun.star.graphic.PrimitiveFactory2D/
-  /implementation
   implementation name=com.sun.star.comp.svx.Impl.FindbarDispatcher
   
constructor=com_sun_star_comp_svx_Impl_FindbarDispatcher_implementation_getFactory
 service name=com.sun.star.comp.svx.FindbarDispatcher/
diff --git a/svx/util/svxcore.component b/svx/util/svxcore.component
index 3a9d43c..46a1852 100644
--- a/svx/util/svxcore.component
+++ b/svx/util/svxcore.component
@@ -18,6 +18,24 @@
  --
 component loader=com.sun.star.loader.SharedLibrary environment=@CPPU_ENV@
 prefix=svxcore xmlns=http://openoffice.org/2010/uno-components;
+  implementation name=com.sun.star.comp.Draw.GraphicExporter
+  
constructor=com_sun_star_comp_Draw_GraphicExporter_implementation_getFactory
+service name=com.sun.star.drawing.GraphicExportFilter/
+  /implementation
+  implementation name=com.sun.star.comp.Svx.GraphicExportHelper
+  
constructor=com_sun_star_comp_Svx_GraphicExportHelper_implementation_getFactory
+service name=com.sun.star.document.BinaryStreamResolver/
+service name=com.sun.star.document.GraphicObjectResolver/
+  /implementation
+  implementation name=com.sun.star.comp.Svx.GraphicImportHelper
+  
constructor=com_sun_star_comp_Svx_GraphicImportHelper_implementation_getFactory
+service name=com.sun.star.document.BinaryStreamResolver/
+service name=com.sun.star.document.GraphicObjectResolver/
+  /implementation
+  implementation name=com.sun.star.comp.graphic.PrimitiveFactory2D
+  
constructor=com_sun_star_comp_graphic_PrimitiveFactory2D_implementation_getFactory
+service name=com.sun.star.graphic.PrimitiveFactory2D/
+  /implementation
   implementation name=com.sun.star.comp.svx.ExtrusionDepthController
 service name=com.sun.star.frame.ToolbarController/
   /implementation
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [libreoffice-projects] [ANN] LIbreOffice 4.2.0 RC1 available

On Fri, Dec 20, 2013 at 2:31 PM, Jean Weber jeanwe...@gmail.com wrote:
 Hi Christian,

 I used the regular (32-bit) build, which the download page suggested,
 and which I have always used. Should I be using the 64-bit build? I'll
 try that today.

both should work for 10.9... I would just like a confirmation that the
64 bits build works (which I think it does... as the problem seems to
be tied to the signing of the Python Framework.. which is not
delivered in the 64 bits build (unnecessary since the target 10.8+
already have a suitable system python)

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

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

 xmloff/source/text/txtprmap.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit ef5e7b69440baa9f222d1ec870668d31d08268f0
Author: Eike Rathke er...@redhat.com
Date:   Fri Dec 20 21:15:03 2013 +0100

prepare to accept loext:contextual-spacing, fdo#58112

Change-Id: I58e151743bf910b8b51f1b453e0bfcb4ed767d9d

diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx
index 95c4e00..524bd6b 100644
--- a/xmloff/source/text/txtprmap.cxx
+++ b/xmloff/source/text/txtprmap.cxx
@@ -69,6 +69,11 @@ using namespace ::xmloff::token;
 #define MR_E( a, p, l, t, c ) \
 _M_E( a, p, l, (t|XML_TYPE_PROP_RUBY), c )
 
+// extensions import/export
+#define MAP_EXT(name,prefix,token,type,context)  { name, sizeof(name)-1, 
prefix, token, type, context, SvtSaveOptions::ODFVER_012_EXT_COMPAT, false }
+// extensions import only
+#define MAP_EXT_I(name,prefix,token,type,context)  { name, sizeof(name)-1, 
prefix, token, type, context, SvtSaveOptions::ODFVER_012_EXT_COMPAT, true }
+
 #define M_END() \
 { NULL, 0, 0, XML_TOKEN_INVALID, 0, 0, SvtSaveOptions::ODFVER_010, false }
 
@@ -90,7 +95,8 @@ XMLPropertyMapEntry aXMLParaPropMap[] =
 MP_E( ParaTopMarginRelative,  FO, MARGIN_TOP, 
XML_TYPE_PERCENT16, CTF_PARATOPMARGIN_REL ),
 MP_E( ParaBottomMargin,   FO, MARGIN_BOTTOM,  
XML_TYPE_MEASURE|MID_FLAG_MULTI_PROPERTY, CTF_PARABOTTOMMARGIN ),
 MP_E( ParaBottomMarginRelative,FO,MARGIN_BOTTOM,  
XML_TYPE_PERCENT16, CTF_PARABOTTOMMARGIN_REL ),
-{ ParaContextMargin, sizeof(ParaContextMargin)-1, XML_NAMESPACE_STYLE, 
XML_CONTEXTUAL_SPACING, XML_TYPE_BOOL|XML_TYPE_PROP_PARAGRAPH, 0, 
SvtSaveOptions::ODFVER_012_EXT_COMPAT, false },
+MAP_EXT( ParaContextMargin, XML_NAMESPACE_STYLE, XML_CONTEXTUAL_SPACING, 
XML_TYPE_BOOL|XML_TYPE_PROP_PARAGRAPH, 0 ),  // proposed ODF 1.2+
+MAP_EXT_I( ParaContextMargin, XML_NAMESPACE_LO_EXT, 
XML_CONTEXTUAL_SPACING, XML_TYPE_BOOL|XML_TYPE_PROP_PARAGRAPH, 0 ),   // 
extension namespace
 // RES_CHRATR_CASEMAP
 MT_E( CharCaseMap,FO, FONT_VARIANT,   
XML_TYPE_TEXT_CASEMAP_VAR,  0 ),
 MT_E( CharCaseMap,FO, TEXT_TRANSFORM, 
XML_TYPE_TEXT_CASEMAP,  0 ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - sfx2/AllLangResTarget_sfx2.mk sfx2/source sfx2/uiconfig sfx2/UIConfig_sfx.mk svx/source

 sfx2/AllLangResTarget_sfx2.mk   |1 
 sfx2/UIConfig_sfx.mk|1 
 sfx2/source/dialog/inputdlg.cxx |   66 
 sfx2/source/dialog/inputdlg.hrc |   16 -
 sfx2/source/dialog/inputdlg.src |   51 --
 sfx2/source/inc/inputdlg.hxx|   12 +---
 sfx2/uiconfig/ui/inputdialog.ui |  108 
 svx/source/tbxctrls/layctrl.cxx |7 +-
 8 files changed, 130 insertions(+), 132 deletions(-)

New commits:
commit 23ac39f99f270261ddad1749f656420766a47c97
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Dec 20 20:29:42 2013 +

convert input dialog to .ui

Change-Id: I7b4dc43bfed39c852692dabebfc1bd196625c333

diff --git a/sfx2/AllLangResTarget_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk
index 8b3e6a2..0484871 100644
--- a/sfx2/AllLangResTarget_sfx2.mk
+++ b/sfx2/AllLangResTarget_sfx2.mk
@@ -45,7 +45,6 @@ $(eval $(call gb_SrsTarget_add_files,sfx/res,\
 sfx2/source/dialog/dialog.src \
 sfx2/source/dialog/dinfdlg.src \
 sfx2/source/dialog/filedlghelper.src \
-sfx2/source/dialog/inputdlg.src \
 sfx2/source/dialog/newstyle.src \
 sfx2/source/dialog/recfloat.src \
 sfx2/source/dialog/taskpane.src \
diff --git a/sfx2/UIConfig_sfx.mk b/sfx2/UIConfig_sfx.mk
index c389696..35b0825 100644
--- a/sfx2/UIConfig_sfx.mk
+++ b/sfx2/UIConfig_sfx.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UIConfig_add_uifiles,sfx,\
sfx2/uiconfig/ui/documentinfopage \
sfx2/uiconfig/ui/documentpropertiesdialog \
sfx2/uiconfig/ui/errorfindemaildialog \
+   sfx2/uiconfig/ui/inputdialog \
sfx2/uiconfig/ui/licensedialog \
sfx2/uiconfig/ui/managestylepage \
sfx2/uiconfig/ui/newstyle \
diff --git a/sfx2/source/dialog/inputdlg.cxx b/sfx2/source/dialog/inputdlg.cxx
index 9a10733..b67f389 100644
--- a/sfx2/source/dialog/inputdlg.cxx
+++ b/sfx2/source/dialog/inputdlg.cxx
@@ -9,73 +9,31 @@
 
 #include inputdlg.hxx
 
-#include inputdlg.hrc
-
 #include sfx2/sfxresid.hxx
 #include vcl/button.hxx
 #include vcl/edit.hxx
 #include vcl/fixed.hxx
 
-#define LABEL_TEXT_SPACE 5
-
-InputDialog::InputDialog (const OUString rLabelText, Window *pParent)
-: ModalDialog(pParent,SfxResId(DLG_INPUT_BOX)),
-  mpEntry(new Edit(this,SfxResId(EDT_INPUT_FIELD))),
-  mpLabel(new FixedText(this,SfxResId(LABEL_INPUT_TEXT))),
-  mpOK(new PushButton(this,SfxResId(BTN_INPUT_OK))),
-  mpCancel(new PushButton(this,SfxResId(BTN_INPUT_CANCEL)))
-{
-SetStyle(GetStyle() | WB_CENTER | WB_VCENTER);
-
-mpLabel-SetText(rLabelText);
-
-// Fit label size to text and reposition edit box
-Size aLabelSize = mpLabel-CalcMinimumSize();
-Size aEditSize = mpEntry-GetSizePixel();
-Size aBtnSize = mpOK-GetSizePixel();
-
-Point aLabelPos = mpLabel-GetPosPixel();
-Point aEditPos = mpEntry-GetPosPixel();
-
-aEditPos.setX(aLabelPos.getX() + aLabelSize.getWidth() + LABEL_TEXT_SPACE);
-
-mpLabel-SetPosSizePixel(aLabelPos,aLabelSize);
-mpEntry-SetPosSizePixel(aEditPos,aEditSize);
-
-// Resize window if needed
-Size aWinSize = GetOutputSize();
-aWinSize.setWidth(aEditPos.getX() + aEditSize.getWidth() + 
LABEL_TEXT_SPACE);
-SetSizePixel(aWinSize);
-
-// Align buttons
-Point aBtnPos = mpCancel-GetPosPixel();
-
-aBtnPos.setX(aWinSize.getWidth() - aBtnSize.getWidth() - LABEL_TEXT_SPACE);
-mpCancel-SetPosPixel(aBtnPos);
-
-aBtnPos.setX(aBtnPos.getX() - aBtnSize.getWidth() - LABEL_TEXT_SPACE);
-mpOK-SetPosPixel(aBtnPos);
-
-mpOK-SetClickHdl(LINK(this,InputDialog,ClickHdl));
-mpCancel-SetClickHdl(LINK(this,InputDialog,ClickHdl));
-}
-
-InputDialog::~InputDialog()
+InputDialog::InputDialog(const OUString rLabelText, Window *pParent)
+: ModalDialog(pParent, InputDialog, sfx/ui/inputdialog.ui)
 {
-delete mpEntry;
-delete mpLabel;
-delete mpOK;
-delete mpCancel;
+get(m_pEntry, entry);
+get(m_pLabel, label);
+get(m_pOK, ok);
+get(m_pCancel, cancel);
+m_pLabel-SetText(rLabelText);
+m_pOK-SetClickHdl(LINK(this,InputDialog,ClickHdl));
+m_pCancel-SetClickHdl(LINK(this,InputDialog,ClickHdl));
 }
 
-OUString InputDialog::getEntryText () const
+OUString InputDialog::getEntryText() const
 {
-return mpEntry-GetText();
+return m_pEntry-GetText();
 }
 
 IMPL_LINK(InputDialog,ClickHdl,PushButton*, pButton)
 {
-EndDialog(pButton == mpOK ? true : false);
+EndDialog(pButton == m_pOK ? true : false);
 return 0;
 }
 
diff --git a/sfx2/source/dialog/inputdlg.hrc b/sfx2/source/dialog/inputdlg.hrc
deleted file mode 100644
index 2750d79..000
--- a/sfx2/source/dialog/inputdlg.hrc
+++ /dev/null
@@ -1,16 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- *

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

 xmloff/source/text/txtprmap.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 116e214a82dcdce9d4764646ff43b60d5c7c9392
Author: Eike Rathke er...@redhat.com
Date:   Fri Dec 20 21:15:03 2013 +0100

prepare to accept loext:contextual-spacing, fdo#58112

Change-Id: I58e151743bf910b8b51f1b453e0bfcb4ed767d9d
(cherry picked from commit ef5e7b69440baa9f222d1ec870668d31d08268f0)

diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx
index ae30b11..1e4ed6f 100644
--- a/xmloff/source/text/txtprmap.cxx
+++ b/xmloff/source/text/txtprmap.cxx
@@ -69,6 +69,11 @@ using namespace ::xmloff::token;
 #define MR_E( a, p, l, t, c ) \
 _M_E( a, p, l, (t|XML_TYPE_PROP_RUBY), c )
 
+// extensions import/export
+#define MAP_EXT(name,prefix,token,type,context)  { name, sizeof(name)-1, 
prefix, token, type, context, SvtSaveOptions::ODFVER_012_EXT_COMPAT, false }
+// extensions import only
+#define MAP_EXT_I(name,prefix,token,type,context)  { name, sizeof(name)-1, 
prefix, token, type, context, SvtSaveOptions::ODFVER_012_EXT_COMPAT, true }
+
 #define M_END() \
 { NULL, 0, 0, XML_TOKEN_INVALID, 0, 0, SvtSaveOptions::ODFVER_010, false }
 
@@ -90,7 +95,8 @@ XMLPropertyMapEntry aXMLParaPropMap[] =
 MP_E( ParaTopMarginRelative,  FO, MARGIN_TOP, 
XML_TYPE_PERCENT16, CTF_PARATOPMARGIN_REL ),
 MP_E( ParaBottomMargin,   FO, MARGIN_BOTTOM,  
XML_TYPE_MEASURE|MID_FLAG_MULTI_PROPERTY, CTF_PARABOTTOMMARGIN ),
 MP_E( ParaBottomMarginRelative,FO,MARGIN_BOTTOM,  
XML_TYPE_PERCENT16, CTF_PARABOTTOMMARGIN_REL ),
-{ ParaContextMargin, sizeof(ParaContextMargin)-1, XML_NAMESPACE_STYLE, 
XML_CONTEXTUAL_SPACING, XML_TYPE_BOOL|XML_TYPE_PROP_PARAGRAPH, 0, 
SvtSaveOptions::ODFVER_012_EXT_COMPAT, false },
+MAP_EXT( ParaContextMargin, XML_NAMESPACE_STYLE, XML_CONTEXTUAL_SPACING, 
XML_TYPE_BOOL|XML_TYPE_PROP_PARAGRAPH, 0 ),  // proposed ODF 1.2+
+MAP_EXT_I( ParaContextMargin, XML_NAMESPACE_LO_EXT, 
XML_CONTEXTUAL_SPACING, XML_TYPE_BOOL|XML_TYPE_PROP_PARAGRAPH, 0 ),   // 
extension namespace
 // RES_CHRATR_CASEMAP
 MT_E( CharCaseMap,FO, FONT_VARIANT,   
XML_TYPE_TEXT_CASEMAP_VAR,  0 ),
 MT_E( CharCaseMap,FO, TEXT_TRANSFORM, 
XML_TYPE_TEXT_CASEMAP,  0 ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [libreoffice-projects] [ANN] LIbreOffice 4.2.0 RC1 available

2013-12-20 Thread Jean Weber

On Sat, Dec 21, 2013 at 6:36 AM, Norbert Thiebaud nthieb...@gmail.com wrote:
 On Fri, Dec 20, 2013 at 2:31 PM, Jean Weber jeanwe...@gmail.com wrote:
 Hi Christian,

 I used the regular (32-bit) build, which the download page suggested,
 and which I have always used. Should I be using the 64-bit build? I'll
 try that today.

 both should work for 10.9... I would just like a confirmation that the
 64 bits build works (which I think it does... as the problem seems to
 be tied to the signing of the Python Framework.. which is not
 delivered in the 64 bits build (unnecessary since the target 10.8+
 already have a suitable system python)

 Norbert


64-bit Mac version opened for me as it should.

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

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

 xmloff/source/text/txtprmap.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d1ae39e484f888ddcca15f584cddd2b3ccae1024
Author: Eike Rathke er...@redhat.com
Date:   Fri Dec 20 22:10:46 2013 +0100

fdo#58112 write loext:contextual-spacing accept style:contextual-spacing

Change-Id: I3e6698d9d9399dd5a13658641847df8a5f34f6ae

diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx
index 524bd6b..2eacad24 100644
--- a/xmloff/source/text/txtprmap.cxx
+++ b/xmloff/source/text/txtprmap.cxx
@@ -95,8 +95,8 @@ XMLPropertyMapEntry aXMLParaPropMap[] =
 MP_E( ParaTopMarginRelative,  FO, MARGIN_TOP, 
XML_TYPE_PERCENT16, CTF_PARATOPMARGIN_REL ),
 MP_E( ParaBottomMargin,   FO, MARGIN_BOTTOM,  
XML_TYPE_MEASURE|MID_FLAG_MULTI_PROPERTY, CTF_PARABOTTOMMARGIN ),
 MP_E( ParaBottomMarginRelative,FO,MARGIN_BOTTOM,  
XML_TYPE_PERCENT16, CTF_PARABOTTOMMARGIN_REL ),
-MAP_EXT( ParaContextMargin, XML_NAMESPACE_STYLE, XML_CONTEXTUAL_SPACING, 
XML_TYPE_BOOL|XML_TYPE_PROP_PARAGRAPH, 0 ),  // proposed ODF 1.2+
-MAP_EXT_I( ParaContextMargin, XML_NAMESPACE_LO_EXT, 
XML_CONTEXTUAL_SPACING, XML_TYPE_BOOL|XML_TYPE_PROP_PARAGRAPH, 0 ),   // 
extension namespace
+MAP_EXT_I( ParaContextMargin, XML_NAMESPACE_STYLE, 
XML_CONTEXTUAL_SPACING, XML_TYPE_BOOL|XML_TYPE_PROP_PARAGRAPH, 0 ),// 
proposed ODF 1.2+ and was written by LO=4.2
+MAP_EXT( ParaContextMargin, XML_NAMESPACE_LO_EXT, 
XML_CONTEXTUAL_SPACING, XML_TYPE_BOOL|XML_TYPE_PROP_PARAGRAPH, 0 ), // 
extension namespace
 // RES_CHRATR_CASEMAP
 MT_E( CharCaseMap,FO, FONT_VARIANT,   
XML_TYPE_TEXT_CASEMAP_VAR,  0 ),
 MT_E( CharCaseMap,FO, TEXT_TRANSFORM, 
XML_TYPE_TEXT_CASEMAP,  0 ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [libreoffice-projects] [ANN] LIbreOffice 4.2.0 RC1 available

On Fri, Dec 20, 2013 at 3:07 PM, Jean Weber jeanwe...@gmail.com wrote:
 On Sat, Dec 21, 2013 at 6:36 AM, Norbert Thiebaud nthieb...@gmail.com wrote:
 On Fri, Dec 20, 2013 at 2:31 PM, Jean Weber jeanwe...@gmail.com wrote:
 Hi Christian,

 I used the regular (32-bit) build, which the download page suggested,
 and which I have always used. Should I be using the 64-bit build? I'll
 try that today.

 both should work for 10.9... I would just like a confirmation that the
 64 bits build works (which I think it does... as the problem seems to
 be tied to the signing of the Python Framework.. which is not
 delivered in the 64 bits build (unnecessary since the target 10.8+
 already have a suitable system python)

 Norbert


 64-bit Mac version opened for me as it should.

Good news...
I'm uploading a 'fixed' version to the pre-release section...

FYI I needed to add this

https://gerrit.libreoffice.org/#/c/7152/

to make it work

cloph, as this is just a packaging/signing problem.. it is prolly not
worth bothering with a re-spin of the source tarball...

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

[Libreoffice-commits] core.git: bean/com connectivity/source extensions/source forms/qa include/registry odk/examples qadevOOo/tests sal/qa scripting/java shell/inc shell/source sw/source xmlsecurity/