[Libreoffice-commits] online.git: 3 commits - loleaflet/src

[Mihai Varga]

 loleaflet/src/control/Control.Search.js |4 +++
 loleaflet/src/control/Control.js|8 ---
 loleaflet/src/layer/tile/GridLayer.js   |   36 +---
 3 files changed, 20 insertions(+), 28 deletions(-)

New commits:
commit 1cea814fcbdb6b0d4d82c40c1fdd747814c451d0
Author: Mihai Varga 
Date:   Thu Jul 9 09:32:24 2015 +0300

loleaflet: removed unnecessary event

diff --git a/loleaflet/src/layer/tile/GridLayer.js 
b/loleaflet/src/layer/tile/GridLayer.js
index df2e744..6521d5f 100644
--- a/loleaflet/src/layer/tile/GridLayer.js
+++ b/loleaflet/src/layer/tile/GridLayer.js
@@ -694,11 +694,6 @@ L.GridLayer = L.Layer.extend({
 
L.DomUtil.addClass(tile.el, 'leaflet-tile-loaded');
 
-   this.fire('tileload', {
-   tile: tile.el,
-   coords: coords
-   });
-
if (this._noTilesToLoad()) {
this.fire('load');
}
commit 607ea7b453441712affdf095a367b7b099f49f49
Author: Mihai Varga 
Date:   Thu Jul 9 09:30:28 2015 +0300

loleaflet: fixed isValidTile method and when tilecanceling occurs

diff --git a/loleaflet/src/layer/tile/GridLayer.js 
b/loleaflet/src/layer/tile/GridLayer.js
index b658b28..df2e744 100644
--- a/loleaflet/src/layer/tile/GridLayer.js
+++ b/loleaflet/src/layer/tile/GridLayer.js
@@ -40,10 +40,6 @@ L.GridLayer = L.Layer.extend({
this._viewReset();
this._update();
this._map._docLayer = this;
-   var mapDim = this._map.getSize();
-   this._maxVisibleTiles =
-   (Math.floor(mapDim.x / this._tileSize) + 2) *
-   (Math.floor(mapDim.y / this._tileSize) + 2);
},
 
beforeAdd: function (map) {
@@ -484,6 +480,8 @@ L.GridLayer = L.Layer.extend({
}
}
 
+   // if there is no exiting tile in the current view
+   var newView = true;
// create a queue of coordinates to load tiles from
for (var j = tileRange.min.y; j <= tileRange.max.y; j++) {
for (var i = tileRange.min.x; i <= tileRange.max.x; 
i++) {
@@ -497,6 +495,7 @@ L.GridLayer = L.Layer.extend({
var tile = this._tiles[key];
if (tile) {
tile.current = true;
+   newView = false;
} else {
queue.push(coords);
}
@@ -504,7 +503,7 @@ L.GridLayer = L.Layer.extend({
}
 
if (queue.length !== 0) {
-   if (queue.length > this._maxVisibleTiles) {
+   if (newView) {
// we know that a new set of tiles that cover 
the whole view has been requested
// so we're able to cancel the previous 
requests that are being processed
this._map.socket.send('canceltiles');
@@ -533,22 +532,14 @@ L.GridLayer = L.Layer.extend({
},
 
_isValidTile: function (coords) {
-   var crs = this._map.options.crs;
-
-   if (!crs.infinite) {
-   // don't load tile if it's out of bounds and not wrapped
-   var bounds = this._globalTileRange;
-   if ((!crs.wrapLng && (coords.x < bounds.min.x || 
coords.x > bounds.max.x)) ||
-   (!crs.wrapLat && (coords.y < bounds.min.y || 
coords.y > bounds.max.y))) { return false; }
+   if (coords.x < 0 || coords.y < 0) {
+   return false;
}
-
-   if (coords.x < 0 || coords.y < 0) { return false; }
-
-   if (!this.options.bounds) { return true; }
-
-   // don't load tile if it doesn't intersect the bounds in options
-   var tileBounds = this._tileCoordsToBounds(coords);
-   return 
L.latLngBounds(this.options.bounds).intersects(tileBounds);
+   if (coords.x * this._tileWidthTwips > this._docWidthTwips ||
+   coords.y * this._tileHeightTwips > 
this._docHeightTwips) {
+   return false;
+   }
+   return true;
},
 
_keyToBounds: function (key) {
commit ddaa3b49c14b6c9ee4470830d5db175bb6457a81
Author: Mihai Varga 
Date:   Thu Jul 9 09:28:41 2015 +0300

loleaflet: restore focus to the document after toolbar interaction

diff --git a/loleaflet/src/control/Control.Search.js 
b/loleaflet/src/control/Control.Search.js
index c007067..39e7cb7 100644
--- a/loleaflet/src/control/Control.Search.js
+++ b/loleaflet/src/control/Control.Search.js
@@ -72,6 +72,7 @@ L.Control.Search = L.Control.extend({
this._map.socket.send('u

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source include/editeng include/svx svx/source

[matteocam]

 editeng/source/outliner/overflowingtxt.cxx |   10 +
 include/editeng/overflowingtxt.hxx |4 +-
 include/svx/textchainflow.hxx  |   11 -
 svx/source/svdraw/svdedxv.cxx  |2 -
 svx/source/svdraw/textchainflow.cxx|   57 -
 5 files changed, 53 insertions(+), 31 deletions(-)

New commits:
commit b0273e17cdf5a0f0877c3bc64543b333727cfdc7
Author: matteocam 
Date:   Wed Jul 8 23:06:07 2015 -0400

Test for actual cursor overflow

Change-Id: Ia306b8ee15d986c773787a500a23a886caf20087

diff --git a/editeng/source/outliner/overflowingtxt.cxx 
b/editeng/source/outliner/overflowingtxt.cxx
index 03ed385..304e04b 100644
--- a/editeng/source/outliner/overflowingtxt.cxx
+++ b/editeng/source/outliner/overflowingtxt.cxx
@@ -126,6 +126,16 @@ OFlowChainedText::OFlowChainedText(Outliner *pOutl)
 mpNonOverflowingTxt = pOutl->GetNonOverflowingText();
 }
 
+ESelection OFlowChainedText::GetInsertionPointSel() const
+{
+return mpOverflowingTxt->GetInsertionPointSel();
+}
+
+ESelection OFlowChainedText::GetOverflowPointSel() const
+{
+return mpNonOverflowingTxt->GetOverflowPointSel();
+}
+
 OutlinerParaObject *OFlowChainedText::CreateOverflowingParaObject(Outliner 
*pOutliner, OutlinerParaObject *pTextToBeMerged)
 {
 // Just return the roughly merged paras fpr now
diff --git a/include/editeng/overflowingtxt.hxx 
b/include/editeng/overflowingtxt.hxx
index 7faa9a9..4e97fcc 100644
--- a/include/editeng/overflowingtxt.hxx
+++ b/include/editeng/overflowingtxt.hxx
@@ -49,7 +49,6 @@ private:
 OverflowingText(EditTextObject *pTObj);
 
 const EditTextObject *mpContentTextObj;
-ESelection maInsertionPointSel;
 };
 
 class NonOverflowingText {
@@ -81,7 +80,8 @@ class EDITENG_DLLPUBLIC OFlowChainedText {
 OutlinerParaObject *CreateOverflowingParaObject(Outliner *, 
OutlinerParaObject *);
 OutlinerParaObject *CreateNonOverflowingParaObject(Outliner *);
 
-ESelection GetInsertionPointSel() const { return 
mpOverflowingTxt->GetInsertionPointSel(); }
+ESelection GetInsertionPointSel() const;
+ESelection GetOverflowPointSel() const;
 
 protected:
 void impSetOutlinerToEmptyTxt(Outliner *);
diff --git a/include/svx/textchainflow.hxx b/include/svx/textchainflow.hxx
index b2373e8..00a04f3 100644
--- a/include/svx/textchainflow.hxx
+++ b/include/svx/textchainflow.hxx
@@ -62,7 +62,12 @@ class TextChainFlow {
 
 //  -- Protected Members --
 protected:
+
+// Cursor related
+bool mbPossiblyCursorOut;
 CursorChainingEvent maCursorEvent;
+ESelection maOverflowPosSel;
+
 
 void impCheckForFlowEvents(SdrOutliner *, SdrOutliner *);
 
@@ -80,8 +85,10 @@ class TextChainFlow {
 
 //  -- Private Members --
 private:
+// XXX: It would be nice to get rid of this
+bool mbOFisUFinduced;
 
-void impUpdateCursorInfo(SdrOutliner *, bool);
+void impUpdateCursorInfo();
 
 SdrTextObj *mpTargetLink;
 SdrTextObj *mpNextLink;
@@ -96,8 +103,6 @@ class TextChainFlow {
 OFlowChainedText *mpOverflChText;
 UFlowChainedText *mpUnderflChText;
 
-// XXX: It would be nice to get rid of this
-bool mbOFisUFinduced;
 };
 
 
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index d893dab..16373c3 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -499,7 +499,7 @@ IMPL_LINK_NOARG(SdrObjEditView,ImpChainingEventHdl)
 // We prevent to trigger further handling of overflow/underflow 
for pTextObj
 pTextChain->SetNilChainingEvent(pTextObj, true);
 
-// Save previous selection pos
+// Save previous selection pos // NOTE: It must be done to have 
the right CursorEvent in KeyInput
 pTextChain->SetPreChainingSel(pTextObj, pOLV->GetSelection());
 //maPreChainingSel = new ESelection(pOLV->GetSelection());
 
diff --git a/svx/source/svdraw/textchainflow.cxx 
b/svx/source/svdraw/textchainflow.cxx
index 161e615..1df7fe3 100644
--- a/svx/source/svdraw/textchainflow.cxx
+++ b/svx/source/svdraw/textchainflow.cxx
@@ -38,7 +38,8 @@ TextChainFlow::TextChainFlow(SdrTextObj *pChainTarget)
 mpOverflChText = NULL;
 mpUnderflChText = NULL;
 
-maCursorEvent = CursorChainingEvent::UNCHANGED;
+maCursorEvent = CursorChainingEvent::NULL_EVENT;
+mbPossiblyCursorOut = false;
 }
 
 
@@ -79,8 +80,6 @@ void TextChainFlow::impCheckForFlowEvents(SdrOutliner 
*pFlowOutl, SdrOutliner *p
 bOverflow = bIsPageOverflow && mpNextLink;
 bUnderflow = !bIsPageOverflow &&  mpNextLink && mpNextLink->HasText();
 
-impUpdateCursorInfo(pFlowOutl, bOverflow);
-
 if (pParamOutl != NULL)
 {
 pFlowOutl->SetUpdateMode(bOldUpdateMode);
@@ -92,22 +91,22 @@ void TextChainFlow::impCheckForFlowEvents(SdrOutliner 
*pFlowOutl, SdrOutliner *p
 // Set current underflowing text (if any)
 mpUnderflChText = bUnderflow ? new UFlowChainedTe

[Libreoffice-commits] core.git: 4 commits - tools/CppunitTest_tools_test.mk tools/qa vcl/inc vcl/opengl

[Tomaž Vajngerl]

 tools/CppunitTest_tools_test.mk|1 
 tools/qa/cppunit/test_rectangle.cxx|   60 ++
 vcl/inc/opengl/program.hxx |2 
 vcl/inc/openglgdiimpl.hxx  |2 
 vcl/opengl/blendedTextureVertexShader.glsl |3 
 vcl/opengl/dumbVertexShader.glsl   |4 -
 vcl/opengl/gdiimpl.cxx |   82 -
 vcl/opengl/program.cxx |   30 +++--
 vcl/opengl/scale.cxx   |1 
 vcl/opengl/textureVertexShader.glsl|3 
 vcl/opengl/transformedTextureVertexShader.glsl |5 -
 11 files changed, 143 insertions(+), 50 deletions(-)

New commits:
commit 2e99e4e11d33679aed674eea0d6054d16d39d6df
Author: Tomaž Vajngerl 
Date:   Wed Jul 8 18:43:32 2015 +0900

opengl: use MVP matrix in vertex shaders, pixel offsets

ChangChange all vertex shaders to accept model, view, projection
matrix to calculate the vertex position. So now we don't need to
convert the coordinates to OpenGL coordinate space [-1.0, 1.0]
anymore.

Additionally make it possible to offset vertex coordinates so
we can apply 0.5 px offset (to hit the pixel center) at some
operations.

Change-Id: I8e0a61d5fd4ab6aaa1c0c94439061725918577a0

diff --git a/vcl/inc/opengl/program.hxx b/vcl/inc/opengl/program.hxx
index 3ac0ff4..5ca9aff 100644
--- a/vcl/inc/opengl/program.hxx
+++ b/vcl/inc/opengl/program.hxx
@@ -67,6 +67,8 @@ public:
const basegfx::B2DPoint& rY );
 void SetBlendMode( GLenum nSFactor, GLenum nDFactor );
 
+void ApplyMatrix(float fWidth, float fHeight, float fPixelOffset = 0.0f);
+
 bool DrawTexture( OpenGLTexture& rTexture );
 
 protected:
diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index 444c9f2..b056382 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -72,6 +72,8 @@ protected:
 void ImplDrawLineAA( double nX1, double nY1, double nX2, double nY2, bool 
edge = false );
 bool CheckOffscreenTexture();
 
+void ApplyProgramMatrices(float fPixelOffset = 0.0);
+
 public:
 bool UseProgram( const OUString& rVertexShader, const OUString& 
rFragmentShader, const OString& preamble = "" );
 bool UseSolid( SalColor nColor, sal_uInt8 nTransparency );
diff --git a/vcl/opengl/blendedTextureVertexShader.glsl 
b/vcl/opengl/blendedTextureVertexShader.glsl
index bc8972c..3a9b827 100644
--- a/vcl/opengl/blendedTextureVertexShader.glsl
+++ b/vcl/opengl/blendedTextureVertexShader.glsl
@@ -12,9 +12,10 @@ attribute vec2 tex_coord_in;
 attribute vec2 alpha_coord_in;
 varying vec2 tex_coord;
 varying vec2 alpha_coord;
+uniform mat4 mvp;
 
 void main() {
-   gl_Position = position;
+   gl_Position = mvp * position;
tex_coord = tex_coord_in;
alpha_coord = alpha_coord_in;
 }
diff --git a/vcl/opengl/dumbVertexShader.glsl b/vcl/opengl/dumbVertexShader.glsl
index 47061f6..deaa35b 100644
--- a/vcl/opengl/dumbVertexShader.glsl
+++ b/vcl/opengl/dumbVertexShader.glsl
@@ -8,8 +8,10 @@
  */
 
 attribute vec4 position;
+uniform mat4 mvp;
+
 void main() {
-   gl_Position = position;
+   gl_Position = mvp * position;
 }
 
 
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index e9ad376..97f1c14 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -36,9 +36,6 @@
 
 #include 
 
-#define OPENGL_COORD_X(x) GLfloat((2.0 * double(x)) / GetWidth() - 1.0)
-#define OPENGL_COORD_Y(y) GLfloat(1.0 - (2.0 * double(y)) / GetHeight())
-
 OpenGLSalGraphicsImpl::OpenGLSalGraphicsImpl(SalGraphics& rParent, 
SalGeometryProvider *pProvider)
 : mpContext(0)
 , mrParent(rParent)
@@ -194,6 +191,11 @@ void OpenGLSalGraphicsImpl::PostDraw()
 CHECK_GL_ERROR();
 }
 
+void OpenGLSalGraphicsImpl::ApplyProgramMatrices(float fPixelOffset)
+{
+mpProgram->ApplyMatrix(GetWidth(), GetHeight(), fPixelOffset);
+}
+
 void OpenGLSalGraphicsImpl::freeResources()
 {
 // TODO Delete shaders, programs and textures if not shared
@@ -453,9 +455,10 @@ void OpenGLSalGraphicsImpl::DrawPoint( long nX, long nY )
 {
 GLfloat pPoint[2];
 
-pPoint[0] = OPENGL_COORD_X(nX);
-pPoint[1] = OPENGL_COORD_Y(nY);
+pPoint[0] = GLfloat(nX);
+pPoint[1] = GLfloat(nY);
 
+ApplyProgramMatrices(0.5f);
 mpProgram->SetVertices( pPoint );
 glDrawArrays( GL_POINTS, 0, 1 );
 
@@ -466,11 +469,12 @@ void OpenGLSalGraphicsImpl::DrawLine( double nX1, double 
nY1, double nX2, double
 {
 GLfloat pPoints[4];
 
-pPoints[0] = OPENGL_COORD_X(nX1);
-pPoints[1] = OPENGL_COORD_Y(nY1);
-pPoints[2] = OPENGL_COORD_X(nX2);
-pPoints[3] = OPENGL_COORD_Y(nY2);
+pPoints[0] = GLfloat(nX1);
+pPoints[1] = GLfloat(nY1);
+pPoints[2] = GLfloat(nX2);
+pPoints[3] = GLfloat(nY2);
 
+ApplyProgramMatrices(0.5f);
 mpProgram->SetVertices( pPoints );
 glDrawArrays( GL_LINES, 0, 2 );
 
@@ -484,19 +488,12 @@ void OpenGLSalGrap

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

[Matthew J . Francis]

 stoc/source/inspect/introspection.cxx |   24 +++-
 1 file changed, 7 insertions(+), 17 deletions(-)

New commits:
commit 85ce6a2446deb0f4c01604b6188f969603de9b16
Author: Matthew J. Francis 
Date:   Thu Jul 9 09:03:46 2015 +0800

Eliminate pointless string copies

Change-Id: I30049795f511704a43ed0eaf8dd0841c7109c334

diff --git a/stoc/source/inspect/introspection.cxx 
b/stoc/source/inspect/introspection.cxx
index cfa7085..c92d636 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -1489,22 +1489,12 @@ Any ImplIntrospectionAccess::getMaterial() 
throw(RuntimeException, std::exceptio
 return maInspectedObject;
 }
 
-// Hilfs-Funktion zur LowerCase-Wandlung eines OUString
-OUString toLower( const OUString& aUStr )
-{
-// Tabelle fuer XExactName pflegen
-OUString aOWStr( aUStr.getStr() );
-OUString aOWLowerStr = aOWStr.toAsciiLowerCase();
-OUString aLowerUStr( aOWLowerStr.getStr() );
-return aLowerUStr;
-}
-
 // Methoden von XExactName
 OUString ImplIntrospectionAccess::getExactName( const OUString& 
rApproximateName ) throw( RuntimeException, std::exception )
 {
 OUString aRetStr;
 LowerToExactNameMap::iterator aIt =
-mpStaticImpl->maLowerToExactNameMap.find( toLower( rApproximateName ) 
);
+mpStaticImpl->maLowerToExactNameMap.find( 
rApproximateName.toAsciiLowerCase() );
 if( !( aIt == mpStaticImpl->maLowerToExactNameMap.end() ) )
 aRetStr = (*aIt).second;
 return aRetStr;
@@ -1898,7 +1888,7 @@ css::uno::Reference 
Implementation::inspect(
 rPropNameMap[ aPropName ] = rPropCount;
 
 // Tabelle fuer XExactName pflegen
-rLowerToExactNameMap[ toLower( aPropName ) ] = aPropName;
+rLowerToExactNameMap[ aPropName.toAsciiLowerCase() ] = 
aPropName;
 }
 else
 {
@@ -1989,7 +1979,7 @@ css::uno::Reference 
Implementation::inspect(
 rPropNameMap[ aPropName ] = rPropCount;
 
 // Tabelle fuer XExactName pflegen
-rLowerToExactNameMap[ toLower( aPropName ) ] = 
aPropName;
+rLowerToExactNameMap[ aPropName.toAsciiLowerCase() ] = 
aPropName;
 
 // Field merken
 
IntrospectionAccessStatic_Impl::checkInterfaceArraySize( 
pAccess->aInterfaceSeq1,
@@ -2169,7 +2159,7 @@ css::uno::Reference 
Implementation::inspect(
 rPropNameMap[ aPropName ] = rPropCount;
 
 // Tabelle fuer XExactName pflegen
-rLowerToExactNameMap[ toLower( aPropName ) ] = 
aPropName;
+rLowerToExactNameMap[ aPropName.toAsciiLowerCase() 
] = aPropName;
 
 // get-Methode merken
 
IntrospectionAccessStatic_Impl::checkInterfaceArraySize( 
pAccess->aInterfaceSeq1,
@@ -2359,7 +2349,7 @@ css::uno::Reference 
Implementation::inspect(
 rPropNameMap[ aPropName ] = rPropCount;
 
 // Tabelle fuer XExactName pflegen
-rLowerToExactNameMap[ toLower( aPropName ) ] = 
aPropName;
+rLowerToExactNameMap[ aPropName.toAsciiLowerCase() 
] = aPropName;
 
 // set-Methode merken
 
IntrospectionAccessStatic_Impl::checkInterfaceArraySize( 
pAccess->aInterfaceSeq2,
@@ -2421,7 +2411,7 @@ css::uno::Reference 
Implementation::inspect(
 rMethodNameMap[ aMethName2 ] = 
iAllExportedMethod;
 
 // Tabelle fuer XExactName pflegen
-rLowerToExactNameMap[ toLower( aMethName2 ) ] 
= aMethName2;
+rLowerToExactNameMap[ 
aMethName2.toAsciiLowerCase() ] = aMethName2;
 }
 else
 {
@@ -2580,7 +2570,7 @@ css::uno::Reference 
Implementation::inspect(
 rPropNameMap[ aPropName ] = rPropCount;
 
 // Tabelle fuer XExactName pflegen
-rLowerToExactNameMap[ toLower( aPropName ) ] = aPropName;
+rLowerToExactNameMap[ aPropName.toAsciiLowerCase() ] = aPropName;
 
 // Field merken
 IntrospectionAccessStatic_Impl::checkInterfaceArraySize( 
pAccess->aInterfaceSeq1,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Yousuf Philips]

 sd/uiconfig/sdraw/toolbar/standardbar.xml |6 --
 sd/uiconfig/sdraw/toolbar/toolbar.xml |   19 ++-
 2 files changed, 14 insertions(+), 11 deletions(-)

New commits:
commit 240d6c9fb84be66500136e3a2fb8e1ff309d2a54
Author: Yousuf Philips 
Date:   Thu Jul 9 04:37:30 2015 +0400

tdf#84909 Draw: Drawing toolbar exclusive to shapes

Change-Id: I0ac457840a1d9df6d075bdd4e8205c19c5055204
Reviewed-on: https://gerrit.libreoffice.org/16875
Reviewed-by: Yousuf Philips 
Tested-by: Yousuf Philips 

diff --git a/sd/uiconfig/sdraw/toolbar/standardbar.xml 
b/sd/uiconfig/sdraw/toolbar/standardbar.xml
index 4b424b4..06c7d5d 100644
--- a/sd/uiconfig/sdraw/toolbar/standardbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/standardbar.xml
@@ -49,10 +49,12 @@
  
  
  
- 
- 
  
+ 
  
+ 
+ 
+ 
  
  
  
diff --git a/sd/uiconfig/sdraw/toolbar/toolbar.xml 
b/sd/uiconfig/sdraw/toolbar/toolbar.xml
index ee1ef3d..79c1c7d 100644
--- a/sd/uiconfig/sdraw/toolbar/toolbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/toolbar.xml
@@ -18,32 +18,33 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 http://openoffice.org/2001/toolbar"; 
xmlns:xlink="http://www.w3.org/1999/xlink"; toolbar:id="toolbar">
- 
+ 
  
  
  
  
- 
- 
- 
+ 
+ 
+ 
  
- 
+ 
  
  
  
  
  
  
- 
  
  
- 
- 
- 
  
  
  
  
+ 
+ 
+ 
+ 
+ 
  
  
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/source/core/data/documen7.cxx |   20 ++--
 1 file changed, 14 insertions(+), 6 deletions(-)

New commits:
commit bf35419b68d7f100a634572236f7d593638981c8
Author: Eike Rathke 
Date:   Thu Jul 9 00:18:04 2015 +0200

Resolves: tdf#84762 collect all recalc-always cells before setting any dirty

Change-Id: I38f69bcbb9eb550fb97b0f84bc0cb486863060b4

diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx
index d89ea62..b67cce9 100644
--- a/sc/source/core/data/documen7.cxx
+++ b/sc/source/core/data/documen7.cxx
@@ -419,6 +419,7 @@ void ScDocument::CalcFormulaTree( bool bOnlyForced, bool 
bProgressBar, bool bSet
 CalcAll();
 else
 {
+::std::vector vAlwaysDirty;
 ScFormulaCell* pCell = pFormulaTree;
 while ( pCell )
 {
@@ -428,12 +429,11 @@ void ScDocument::CalcFormulaTree( bool bOnlyForced, bool 
bProgressBar, bool bSet
 {
 if ( pCell->GetCode()->IsRecalcModeAlways() )
 {
-// pCell is set to Dirty again!
-ScFormulaCell* pNext = pCell->GetNext();
-pCell->SetDirty();
-// if pNext==0 and new dependencies were appended at the 
end,
-// this does not matter since they all are bDirty
-pCell = pNext;
+// pCell and dependents are to be set dirty again, collect
+// them first and broadcast afterwards to not break the
+// FormulaTree chain here.
+vAlwaysDirty.push_back( pCell);
+pCell = pCell->GetNext();
 }
 else
 {   // calculate the other single
@@ -443,6 +443,14 @@ void ScDocument::CalcFormulaTree( bool bOnlyForced, bool 
bProgressBar, bool bSet
 }
 }
 }
+for (::std::vector::iterator it( 
vAlwaysDirty.begin()), itEnd( vAlwaysDirty.end());
+it != itEnd; ++it)
+{
+pCell = *it;
+if (!pCell->GetDirty())
+pCell->SetDirty();
+}
+
 bool bProgress = !bOnlyForced && nFormulaCodeInTree && bProgressBar;
 if ( bProgress )
 ScProgress::CreateInterpretProgress( this, true );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot]

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

New commits:
commit d3b6f3790953bdfeaeebcd3ba9ec370d94ca4ebf
Author: Olivier Hallot 
Date:   Wed Jul 8 18:36:35 2015 -0300

Updated core
Project: help  3fb910bf25d846dd7bc1902e8fe54518b417e793

Fix license header in these 2 files

Change-Id: I1878ba033c025f5c8794ffd446b77c28de7b0342
Reviewed-on: https://gerrit.libreoffice.org/16870
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index fd9b00b..3fb910b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit fd9b00bd84e3fe1a0aa087f5355aa0fcd27ef95f
+Subproject commit 3fb910bf25d846dd7bc1902e8fe54518b417e793
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot]

 source/text/scalc/01/ODFF.xhp   |   40 ++--
 source/text/scalc/01/func_timevalue.xhp |   38 +-
 2 files changed, 35 insertions(+), 43 deletions(-)

New commits:
commit 3fb910bf25d846dd7bc1902e8fe54518b417e793
Author: Olivier Hallot 
Date:   Wed Jul 8 18:36:35 2015 -0300

Fix license header in these 2 files

Change-Id: I1878ba033c025f5c8794ffd446b77c28de7b0342
Reviewed-on: https://gerrit.libreoffice.org/16870
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/source/text/scalc/01/ODFF.xhp b/source/text/scalc/01/ODFF.xhp
index 85aebf9..ad3695b 100644
--- a/source/text/scalc/01/ODFF.xhp
+++ b/source/text/scalc/01/ODFF.xhp
@@ -1,35 +1,31 @@
 
 
 
- 
+* This file is part of the LibreOffice project.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public
+* License, v. 2.0. If a copy of the MPL was not distributed with this
+* file, You can obtain one at http://mozilla.org/MPL/2.0/.
+*
+* This file incorporates work covered by the following license notice:
+*
+*   Licensed to the Apache Software Foundation (ASF) under one or more
+*   contributor license agreements. See the NOTICE file distributed
+*   with this work for additional information regarding copyright
+*   ownership. The ASF licenses this file to you under the Apache
+*   License, Version 2.0 (the "License"); you may not use this file
+*   except in compliance with the License. You may obtain a copy of
+*   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+-->
 
 
 ODFF
-text/scalc/01/ODFF.xhp
+/text/scalc/01/ODFF.xhp
 
 
 
 
-This function is a 
standard Open Document Formula version 1.2 function.
+This function 
belongs to Open Document Formula version 1.2 Standard.
 
 
 
\ No newline at end of file
diff --git a/source/text/scalc/01/func_timevalue.xhp 
b/source/text/scalc/01/func_timevalue.xhp
index d986caf..7f2f8d6 100644
--- a/source/text/scalc/01/func_timevalue.xhp
+++ b/source/text/scalc/01/func_timevalue.xhp
@@ -1,30 +1,26 @@
 
 
 
- 
+* This file is part of the LibreOffice project.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public
+* License, v. 2.0. If a copy of the MPL was not distributed with this
+* file, You can obtain one at http://mozilla.org/MPL/2.0/.
+*
+* This file incorporates work covered by the following license notice:
+*
+*   Licensed to the Apache Software Foundation (ASF) under one or more
+*   contributor license agreements. See the NOTICE file distributed
+*   with this work for additional information regarding copyright
+*   ownership. The ASF licenses this file to you under the Apache
+*   License, Version 2.0 (the "License"); you may not use this file
+*   except in compliance with the License. You may obtain a copy of
+*   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+-->
 
 
 TIMEVALUE 
-file:///home/tdf/git/core/helpcontent2/source/text/scalc/01/func_timevalue.xhp
+/text/scalc/01/func_timevalue.xhp
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Macro to load and run ppt for impress

[Andrew Douglas Pitonyak]

This does work for me, but, only if I define some global variables in 
the defining module. Try setting OptionExplicit at the top of the module 
and it will flag all of those undefined variables for you.


Global oGlob
GLobal oListener
Global boFinished
Global url



On 07/06/2015 04:54 PM, Jerry Geis wrote:


Sub Load(arg as String)

'register a global event listener, because
'we have to wait until loading has finished
oGlob = CreateUnoService("com.sun.star.frame.GlobalEventBroadcaster")
oListener = 
CreateUnoListener("EvList_","com.sun.star.document.XEventListener")

oGlob.addEventListener(oListener)
boFinished = false

'hide the document while loading so that we do not see the loading window
Dim aProps(2) as new com.sun.star.beans.PropertyValue
Dim oDoc as Object
aProps(0).Name  = "Hidden"
aProps(0).Value = true
aProps(1).Name  = "ReadOnly"
aProps(1).Value = true
url = arg
oDoc = StarDesktop.loadComponentFromURL(url, "_default", 0, aProps)

'wait until loading has finished
while (not boFinished)
wait(5)
wend

oGlob.removeEventListener(oListener)

'loading is done, set the presentation parameters
oDoc.Presentation.Pause = 0
'show the window now as presentation cannot be started
'(segmentation faults) if it is not
oDoc.CurrentController.Frame.ContainerWindow.Visible = true
oDoc.CurrentController.Frame.ContainerWindow.setVisible(false)
'start the presentation
oDoc.Presentation.Start

End Sub

Sub EvList_notifyEvent( o as object )
if o.EventName = "OnLoadFinished" then
if url = o.Source.Location then
boFinished = true
endif
endif

End Sub

Sub EvList_disposing()
End Sub


--
Andrew Pitonyak
My Macro Document: http://www.pitonyak.org/AndrewMacro.odt
Info:  http://www.pitonyak.org/oo.php

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

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svtools/Library_svt.mk

[Pedro Giffuni]

 svtools/Library_svt.mk |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 352796f225e035babb7083f69dbfbcd52ec89b4b
Author: Pedro Giffuni 
Date:   Wed Jul 8 20:57:46 2015 +

jpeg build fixes

Mostly visible when using external jpeg.

Author: Don Lewis (truckman at FreeBSD)

diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index a5013c9..f9f5485 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -76,6 +76,12 @@ $(eval $(call gb_Library_add_linked_libs,svt,\
 $(eval $(call gb_Library_set_ldflags,svt,\
 $$(filter-out -L/usr/lib/jvm%,$$(LDFLAGS)) \
 ))
+ifeq ($(OS),FREEBSD)
+# JDK jpeg library on FreeBSD lives under ${JAVA_HOME}/jre/lib/${ARCH}/
+$(eval $(call gb_Library_set_ldflags,svt,\
+$$(filter-out -L$$(JAVA_HOME)/jre/lib/%,$$(LDFLAGS)) \
+))
+endif
 ifeq ($(GUIBASE),os2)
 # YD FIXME above is not working... needs ldflags hack...
 $(eval $(call gb_Library_set_ldflags,svt,\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sw/source/core/access/accmap.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 6f928deb55b5bcff3e8d11a5ace017732176e86a
Author: Stephan Bergmann 
Date:   Wed Jul 8 23:49:59 2015 +0200

Avoid loplugin:unreffun in non-debug build

Change-Id: I1fbf5a355340e20de881a030bc75ebbfce960d4f

diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 6a0883f..0716234 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -254,7 +254,9 @@ public:
 const SwFEShell *pFESh = nullptr,
 SwAccessibleObjShape_Impl  **pSelShape = nullptr ) const;
 
+#if OSL_DEBUG_LEVEL > 0
 iterator begin() { return maMap.begin(); }
+#endif
 iterator end() { return maMap.end(); }
 const_iterator cbegin() const { return maMap.cbegin(); }
 const_iterator cend() const { return maMap.cend(); }
@@ -599,7 +601,9 @@ public:
 private:
 std::map  maMap;
 public:
+#if OSL_DEBUG_LEVEL > 0
 iterator begin() { return maMap.begin(); }
+#endif
 iterator end() { return maMap.end(); }
 iterator find(const key_type& key) { return maMap.find(key); }
 std::pair insert(const value_type& value ) { return 
maMap.insert(value); }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

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

New commits:
commit 394b054a2f987d99178b72aec23b2f7269c727a5
Author: Stephan Bergmann 
Date:   Wed Jul 8 23:39:52 2015 +0200

Avoid loplugin:staticmethods in non-debug build

Change-Id: I6f480fb205904c7894e73288ecc3297c735a2bd9

diff --git a/writerfilter/source/dmapper/PropertyMap.cxx 
b/writerfilter/source/dmapper/PropertyMap.cxx
index b9f46ff..e289538 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -398,6 +398,8 @@ void PropertyMap::printProperties()
 }
 
 TagLogger::getInstance().endElement();
+#else
+(void) this; // avoid loplugin:staticmethods
 #endif
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 svx/source/form/fmshell.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 8ba3cb7bc40c8b0536f99572cd2a0725db29e525
Author: Stephan Bergmann 
Date:   Wed Jul 8 23:31:54 2015 +0200

Avoid loplugin:staticmethods in non-debug build

Change-Id: I41cf1baa9899a4c8af3382b0c7c047348bf3498e

diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 3f3ddfd..fc286ca 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -1426,6 +1426,8 @@ SdrUnoObj* FmFormShell::GetFormControl( const Reference< 
XControlModel >& _rxMod
 OSL_ENSURE( !pUnoObject, "FmFormShell::GetFormControl: the given 
control model belongs to a wrong page (displayed elsewhere)!" );
 }
 }
+#else
+(void) this; // avoid loplugin:staticmethods
 #endif
 
 return NULL;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 include/xmloff/xmlexp.hxx   |2 +-
 xmloff/source/text/txtimppr.cxx |2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 35ce23bd97995aa15a81eaa29c7a1d4feb78cd86
Author: Stephan Bergmann 
Date:   Wed Jul 8 23:26:57 2015 +0200

Avoid loplugin:staticmethods in non-debug build

Change-Id: I9f98e86556ed4435d24f49b32b848eb9f9a66008

diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx
index dc47596..83c03dc 100644
--- a/include/xmloff/xmlexp.hxx
+++ b/include/xmloff/xmlexp.hxx
@@ -340,7 +340,7 @@ public:
 
 // Check if common attribute list is empty.
 #ifndef DBG_UTIL
-void CheckAttrList() {}
+void CheckAttrList() { (void) this; /* avoid loplugin:staticmethods */ }
 #else
 void CheckAttrList();
 #endif
diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx
index ab11b94..1a0f67e 100644
--- a/xmloff/source/text/txtimppr.cxx
+++ b/xmloff/source/text/txtimppr.cxx
@@ -241,6 +241,8 @@ void XMLTextImportPropertyMapper::FontDefaultsCheck(
aAny );
 }
 }
+
+(void) this; // avoid loplugin:staticmethods
 }
 
 namespace {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc15-open-remote-files-dialog' - 2 commits - framework/source include/sfx2 sc/source sc/uiconfig sfx2/sdi sfx2/source sw/inc sw/sdi sw/source

[Szymon Kłos]

 framework/source/uielement/saveasmenucontroller.cxx |7 ++--
 include/sfx2/sfxsids.hrc|1 
 sc/source/ui/app/scdll.cxx  |1 
 sc/uiconfig/scalc/toolbar/standardbar.xml   |2 -
 sfx2/sdi/docslots.sdi   |5 +++
 sfx2/sdi/sfx.sdi|   27 
 sfx2/source/doc/guisaveas.cxx   |   33 +---
 sfx2/source/doc/objserv.cxx |2 -
 sw/inc/cmdid.h  |1 
 sw/sdi/docsh.sdi|5 ---
 sw/sdi/swriter.sdi  |   27 
 sw/source/uibase/app/swmodule.cxx   |2 -
 12 files changed, 64 insertions(+), 49 deletions(-)

New commits:
commit e2169af9c75739464594d38de12170c47bff8c9d
Author: Szymon Kłos 
Date:   Wed Jul 8 23:17:53 2015 +0200

Working toolbar entry: Save As > Remote file

Change-Id: I5601c7847f30a7d5fb7ede5f90b2a6a89f4c8693

diff --git a/framework/source/uielement/saveasmenucontroller.cxx 
b/framework/source/uielement/saveasmenucontroller.cxx
index 7e4fd92..6460013 100644
--- a/framework/source/uielement/saveasmenucontroller.cxx
+++ b/framework/source/uielement/saveasmenucontroller.cxx
@@ -41,7 +41,7 @@ using namespace framework;
 
 namespace {
 
-static const char CMD_SAVE_REMOTE[]  = ".uno:OpenRemote"; // TODO
+static const char CMD_SAVE_REMOTE[]  = ".uno:SaveAsRemote";
 
 class SaveAsMenuController :  public svt::PopupMenuControllerBase
 {
@@ -115,9 +115,9 @@ void SaveAsMenuController::fillPopupMenu( Reference< 
css::awt::XPopupMenu >& rPo
 if ( pVCLPopupMenu )
 {
 // Open remote menu entry
-pVCLPopupMenu->InsertItem( sal_uInt16( 0 ),
+pVCLPopupMenu->InsertItem( sal_uInt16( 1 ),
FWK_RESSTR( STR_REMOTE_FILE ) );
-pVCLPopupMenu->SetItemCommand( sal_uInt16( 0 ),
+pVCLPopupMenu->SetItemCommand( sal_uInt16( 1 ),
OUString( CMD_SAVE_REMOTE ) );
 }
 }
@@ -160,6 +160,7 @@ void SAL_CALL SaveAsMenuController::itemSelected( const 
css::awt::MenuEvent& rEv
 if ( aCommand == CMD_SAVE_REMOTE )
 {
 Sequence< PropertyValue > aArgsList( 0 );
+
 dispatchCommand( CMD_SAVE_REMOTE, aArgsList );
 }
 }
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index 0f4344e..1755eb5 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -102,6 +102,7 @@
 #define SID_JUMPTOMARK  (SID_SFX_START + 598)
 #define SID_OPENTEMPLATE(SID_SFX_START + 594)
 #define SID_SAVEASDOC   (SID_SFX_START + 502)
+#define SID_SAVEASREMOTE(SID_SFX_START + 516)
 #define SID_SAVEACOPY   (SID_SFX_START + 999)
 #define SID_SAVEACOPYITEM   (SID_SFX_START + 998)
 #define SID_CLOSING (SID_SFX_START +1539)
diff --git a/sfx2/sdi/docslots.sdi b/sfx2/sdi/docslots.sdi
index be17f43..9398f72 100644
--- a/sfx2/sdi/docslots.sdi
+++ b/sfx2/sdi/docslots.sdi
@@ -148,6 +148,11 @@ interface OfficeDocument : Document
 ExecMethod = ExecFile_Impl ;
 StateMethod = GetState_Impl ;
 ]
+SID_SAVEASREMOTE // ole(req) api(final/play/rec)
+[
+ExecMethod = ExecFile_Impl ;
+StateMethod = GetState_Impl ;
+]
 SID_DOCTEMPLATE // ole(no) api(final/play/rec)
 [
 ExecMethod = ExecFile_Impl ;
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index eb6..63c73c3 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -5013,6 +5013,33 @@ SfxBoolItem SaveAs SID_SAVEASDOC
 GroupId = GID_DOCUMENT;
 ]
 
+SfxBoolItem SaveAsRemote SID_SAVEASREMOTE
+(SfxStringItem URL SID_FILE_NAME,SfxStringItem FilterName 
SID_FILTER_NAME,SfxStringItem Password SID_PASSWORD,SfxBoolItem 
PasswordInteraction SID_PASSWORDINTERACTION,SfxStringItem FilterOptions 
SID_FILE_FILTEROPTIONS,SfxStringItem VersionComment 
SID_DOCINFO_COMMENTS,SfxStringItem VersionAuthor SID_DOCINFO_AUTHOR,SfxBoolItem 
Overwrite SID_OVERWRITE,SfxBoolItem Unpacked SID_UNPACK,SfxBoolItem SaveTo 
SID_SAVETO)
+[
+/* flags: */
+AutoUpdate = FALSE,
+Cachable = Cachable,
+FastCall = FALSE,
+HasCoreId = FALSE,
+HasDialog = TRUE,
+ReadOnlyDoc = TRUE,
+Toggle = FALSE,
+Container = TRUE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+Synchron;
+
+/* status: */
+SlotType = SfxStringItem
+
+/* config: */
+AccelConfig = TRUE,
+MenuConfig = TRUE,
+StatusBarConfig = FALSE,
+ToolBoxConfig = TRUE,
+GroupId = GID_DOCUMENT;
+]
+
 
 SfxBoolItem SaveAsTemplate SID_DOCTEMPLATE
 (SfxStringItem TemplateRegion SID_TEMPLATE_REGIONNAME,SfxStringItem 
TemplateName SID_TEMPLATE_NAME)
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisave

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

[Stephan Bergmann]

 testtools/source/bridgetest/bridgetest.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 24dd1b32a669a70baadb7055892930cfe8f11bc0
Author: Stephan Bergmann 
Date:   Wed Jul 8 23:14:57 2015 +0200

loplugin:stringconstant

Change-Id: Ia3275dc10ef18fd5978c7422b33012a5b1e4696c

diff --git a/testtools/source/bridgetest/bridgetest.cxx 
b/testtools/source/bridgetest/bridgetest.cxx
index 6255349..52e337f 100644
--- a/testtools/source/bridgetest/bridgetest.cxx
+++ b/testtools/source/bridgetest/bridgetest.cxx
@@ -967,7 +967,7 @@ static bool raiseException( const Reference< XBridgeTest > 
& xLBT )
 if (rExc.ArgumentPosition == 5 &&
 #if OSL_DEBUG_LEVEL == 0
 // java stack traces trash Message
-rExc.Message.equalsAscii( STRING_TEST_CONSTANT ) &&
+rExc.Message == STRING_TEST_CONSTANT &&
 #endif
 rExc.Context == xLBT->getInterface())
 {
@@ -994,7 +994,7 @@ static bool raiseException( const Reference< XBridgeTest > 
& xLBT )
 if (rExc.Context == xLBT->getInterface()
 #if OSL_DEBUG_LEVEL == 0
 // java stack traces trash Message
-&& rExc.Message.equalsAscii( STRING_TEST_CONSTANT )
+&& rExc.Message == STRING_TEST_CONSTANT
 #endif
 )
 {
@@ -1014,7 +1014,7 @@ static bool raiseException( const Reference< XBridgeTest 
> & xLBT )
 if (rExc.Context == xLBT->getInterface()
 #if OSL_DEBUG_LEVEL == 0
 // java stack traces trash Message
-&& rExc.Message.equalsAscii( STRING_TEST_CONSTANT )
+&& rExc.Message == STRING_TEST_CONSTANT
 #endif
 )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: How to comment on a patch in Gerrit, which is already merged?

[Olivier Hallot]

Hello Regina

It was a mistake introduced by an old Helpauthoring extension. The
extension in LibreOffice git has it corrected.

I will send another patch.

Olivier


On 08/07/2015 17:16, Regina Henschel wrote:
> Hi,
> 
> today I had a look at https://gerrit.libreoffice.org/#/c/16110/. I have
> seen some problems in the patch, but it is already merged. I wrote my
> comments in Gerrit for now. But what would be the correct way, that my
> comments are public and noticed?
> 
> Kind regards
> Regina
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice

-- 
Olivier Hallot
Comunidade LibreOffice
http://ask.libreoffice.org/pt-br
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Eike Rathke]

 sc/inc/address.hxx   |3 +--
 sc/source/core/data/document.cxx |4 ++--
 sc/source/core/data/markdata.cxx |2 +-
 sc/source/core/tool/address.cxx  |   28 ++--
 sc/source/core/tool/compiler.cxx |2 +-
 sc/source/core/tool/interpr3.cxx |2 +-
 sc/source/core/tool/interpr4.cxx |2 +-
 sc/source/filter/excel/xehelper.cxx  |2 +-
 sc/source/filter/excel/xename.cxx|2 +-
 sc/source/ui/app/inputhdl.cxx|2 +-
 sc/source/ui/app/scmod.cxx   |2 +-
 sc/source/ui/docshell/externalrefmgr.cxx |2 +-
 sc/source/ui/miscdlgs/optsolver.cxx  |2 +-
 sc/source/ui/unoobj/cellsuno.cxx |   10 +-
 sc/source/ui/unoobj/chart2uno.cxx|2 +-
 sc/source/ui/unoobj/cursuno.cxx  |   18 +-
 sc/source/ui/view/gridwin.cxx|6 +++---
 sc/source/ui/view/gridwin4.cxx   |2 +-
 sc/source/ui/view/tabview3.cxx   |2 +-
 sc/source/ui/view/tabvwsh3.cxx   |4 ++--
 sc/source/ui/view/viewfun2.cxx   |4 ++--
 21 files changed, 43 insertions(+), 60 deletions(-)

New commits:
commit 5ee9e2983a4b0f3df31e7f8ea4695c2c789edc56
Author: Eike Rathke 
Date:   Wed Jul 8 22:02:48 2015 +0200

remove ScRange::Justify() and replace calls with PutInOrder()

Change-Id: I350050ac085b1f220d5288d33c253ba0c9a5fd2c

diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index f6650d4..9c062b8 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -540,15 +540,14 @@ public:
 
 inline void GetVars( SCCOL& nCol1, SCROW& nRow1, SCTAB& nTab1,
  SCCOL& nCol2, SCROW& nRow2, SCTAB& nTab2 ) const;
+SC_DLLPUBLIC void PutInOrder();
 // The document for the maximum defined sheet number
 SC_DLLPUBLIC bool Move( SCsCOL aDeltaX, SCsROW aDeltaY, SCsTAB aDeltaZ, 
ScDocument* pDocument = NULL );
-SC_DLLPUBLIC void Justify();
 SC_DLLPUBLIC void ExtendTo( const ScRange& rRange );
 SC_DLLPUBLIC bool Intersects( const ScRange& rRange ) const;// do two 
ranges intersect?
 
 ScRange Intersection( const ScRange& rOther ) const;
 
-void PutInOrder();
 inline bool operator==( const ScRange& rRange ) const;
 inline bool operator!=( const ScRange& rRange ) const;
 inline bool operator<( const ScRange& rRange ) const;
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index c8e9a0e..95655f2 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -2008,7 +2008,7 @@ void ScDocument::CopyToDocument(const ScRange& rRange,
 const ScMarkData* pMarks, bool bColRowFlags)
 {
 ScRange aNewRange = rRange;
-aNewRange.Justify();
+aNewRange.PutInOrder();
 
 if( pDestDoc->aDocName.isEmpty() )
 pDestDoc->aDocName = aDocName;
@@ -2041,7 +2041,7 @@ void ScDocument::UndoToDocument(const ScRange& rRange,
 sc::AutoCalcSwitch aAutoCalcSwitch(*this, false);
 
 ScRange aNewRange = rRange;
-aNewRange.Justify();
+aNewRange.PutInOrder();
 SCTAB nTab1 = aNewRange.aStart.Tab();
 SCTAB nTab2 = aNewRange.aEnd.Tab();
 
diff --git a/sc/source/core/data/markdata.cxx b/sc/source/core/data/markdata.cxx
index 55537b2..28c18d7 100644
--- a/sc/source/core/data/markdata.cxx
+++ b/sc/source/core/data/markdata.cxx
@@ -99,7 +99,7 @@ void ScMarkData::ResetMark()
 void ScMarkData::SetMarkArea( const ScRange& rRange )
 {
 aMarkRange = rRange;
-aMarkRange.Justify();
+aMarkRange.PutInOrder();
 if ( !bMarked )
 {
 // Upon creation of a document ScFormatShell GetTextAttrState
diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index a3f756d..81e4047 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -1426,25 +1426,6 @@ void ScRange::PutInOrder()
 }
 }
 
-void ScRange::Justify()
-{
-SCCOL nTempCol;
-if ( aEnd.Col() < (nTempCol = aStart.Col()) )
-{
-aStart.SetCol(aEnd.Col()); aEnd.SetCol(nTempCol);
-}
-SCROW nTempRow;
-if ( aEnd.Row() < (nTempRow = aStart.Row()) )
-{
-aStart.SetRow(aEnd.Row()); aEnd.SetRow(nTempRow);
-}
-SCTAB nTempTab;
-if ( aEnd.Tab() < (nTempTab = aStart.Tab()) )
-{
-aStart.SetTab(aEnd.Tab()); aEnd.SetTab(nTempTab);
-}
-}
-
 void ScRange::ExtendTo( const ScRange& rRange )
 {
 OSL_ENSURE( rRange.IsValid(), "ScRange::ExtendTo - cannot extend to 
invalid range" );
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index e75bce8..0583f71 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -5287,7 +5287,7 @@ bool ScCompiler::HandleTableRef()
 else
 {
 aColRange.aEnd = 
mpToken->GetSingleRef()->toAbs( aPos);
-

How to comment on a patch in Gerrit, which is already merged?

[Regina Henschel]

Hi,

today I had a look at https://gerrit.libreoffice.org/#/c/16110/. I have 
seen some problems in the patch, but it is already merged. I wrote my 
comments in Gerrit for now. But what would be the correct way, that my 
comments are public and noticed?


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

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

[Varun]

 sw/qa/extras/uiwriter/uiwriter.cxx |   29 +
 1 file changed, 29 insertions(+)

New commits:
commit b6c570aff4c6dc7a469ed0e2c3dff8ce8f9934b8
Author: Varun 
Date:   Wed Jul 8 03:15:24 2015 +0530

Added Test for Defaults of Outline Numbering

Change-Id: Ie84087ec0d456a37c6af3e36075d840b802aebf6
Reviewed-on: https://gerrit.libreoffice.org/16837
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 1a0ad8c..0bf5636 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -103,6 +103,7 @@ public:
 void testTdf63214();
 void testTdf90003();
 void testTdf51741();
+void testDefaultsOfOutlineNumbering();
 void testdelofTableRedlines();
 void testTdf81995();
 void testExportToPicture();
@@ -156,6 +157,7 @@ public:
 CPPUNIT_TEST(testTdf63214);
 CPPUNIT_TEST(testTdf90003);
 CPPUNIT_TEST(testTdf51741);
+CPPUNIT_TEST(testDefaultsOfOutlineNumbering);
 CPPUNIT_TEST(testdelofTableRedlines);
 CPPUNIT_TEST(testTdf81995);
 CPPUNIT_TEST(testExportToPicture);
@@ -994,6 +996,33 @@ void SwUiWriterTest::testTdf51741()
 CPPUNIT_ASSERT_EQUAL(sal_Int32(0), pMarkAccess->getAllMarksCount());
 }
 
+void SwUiWriterTest::testDefaultsOfOutlineNumbering()
+{
+uno::Reference 
xDefNum(m_xSFactory->createInstance("com.sun.star.text.DefaultNumberingProvider"),
 uno::UNO_QUERY);
+com::sun::star::lang::Locale alocale;
+alocale.Language = "en";
+alocale.Country = "US";
+uno::Sequence 
aPropVal(xDefNum->getDefaultContinuousNumberingLevels(alocale));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(8), aPropVal.getLength());
+for(int i=0;ihttp://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 97/0b89f96ca14028328388cdc16077afd93647dc

[Michael Stahl]

 97/0b89f96ca14028328388cdc16077afd93647dc |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a576f6b976c9cb460b77c684833ab00e068dfacb
Author: Michael Stahl 
Date:   Wed Jul 8 21:46:30 2015 +0200

Notes added by 'git notes add'

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

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

[Stephan Bergmann]

 vcl/source/edit/textundo.cxx |1 +
 vcl/source/window/event.cxx  |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 97df2dee8ea4f33f4efb7467cfeec2d8954c006c
Author: Stephan Bergmann 
Date:   Wed Jul 8 21:29:36 2015 +0200

Avoid loplugin:staticmethods in non-debug build

Change-Id: Ieb3f5a50ed0ddc9109dc0ad16caa8a8ac5b16362

diff --git a/vcl/source/edit/textundo.cxx b/vcl/source/edit/textundo.cxx
index 1ba423a..e28387b 100644
--- a/vcl/source/edit/textundo.cxx
+++ b/vcl/source/edit/textundo.cxx
@@ -108,6 +108,7 @@ bool TextUndoManager::Redo()
 void TextUndoManager::UndoRedoStart()
 {
 DBG_ASSERT( GetView(), "Undo/Redo: Active View?" );
+(void) this; // avoid loplugin:staticmethods
 }
 
 void TextUndoManager::UndoRedoEnd()
diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx
index ec6a9b6..ea819cd 100644
--- a/vcl/source/window/event.cxx
+++ b/vcl/source/window/event.cxx
@@ -295,6 +295,7 @@ void Window::RemoveUserEvent( ImplSVEvent * nUserEvent )
 "Window::RemoveUserEvent(): Event doesn't send to this window 
or is already removed" );
 DBG_ASSERT( nUserEvent->mbCall,
 "Window::RemoveUserEvent(): Event is already removed" );
+(void) this; // avoid loplugin:staticmethods
 
 if ( nUserEvent->mpWindow )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 basegfx/source/range/b2drangeclipper.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d0ba487bae3a0f6d1fcb9af13397c85e70ad8e1b
Author: Stephan Bergmann 
Date:   Wed Jul 8 21:04:24 2015 +0200

Avoid loplugin:staticmethods in non-debug build

Change-Id: Ie943f6a998f142014c0405892264c8257dccaf6f

diff --git a/basegfx/source/range/b2drangeclipper.cxx 
b/basegfx/source/range/b2drangeclipper.cxx
index 1b49294..e9a3e5e 100644
--- a/basegfx/source/range/b2drangeclipper.cxx
+++ b/basegfx/source/range/b2drangeclipper.cxx
@@ -370,6 +370,7 @@ namespace basegfx
 OSL_ENSURE( isSweepLineEnteringRect ||
 mpLeadingRightEdge == &rActiveEdge,
 "ImplPolygon::intersect(): sweep initial own edge 
hit: wrong leading edge" );
+(void) this; // avoid loplugin:staticmethods
 }
 
 void handleFinalOwnRightEdge(ActiveEdge& rActiveEdge)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 io/source/stm/streamhelper.hxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8585e0a1fd7a31a6ee85b05fdff57b11797e0ea3
Author: Stephan Bergmann 
Date:   Wed Jul 8 20:59:29 2015 +0200

Avoid loplugin:staticmethods in non-debug build

Change-Id: I205531a51f9d3e6611aafc5eb8fbd1ab49a517d8

diff --git a/io/source/stm/streamhelper.hxx b/io/source/stm/streamhelper.hxx
index 0275557..1fa232b 100644
--- a/io/source/stm/streamhelper.hxx
+++ b/io/source/stm/streamhelper.hxx
@@ -118,6 +118,7 @@ private:
 assert( m_nOccupiedBuffer <= m_nBufferLen );
 assert( m_nStart >= 0 );
 assert( 0 == m_nStart || m_nStart < m_nBufferLen );
+(void) this; // avoid loplugin:staticmethods
 }
 
 sal_Int8*m_p;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 cppu/source/uno/prim.hxx |   13 +
 1 file changed, 5 insertions(+), 8 deletions(-)

New commits:
commit 81275d4725236b0c7fe9e724299dd67eeb203c99
Author: Stephan Bergmann 
Date:   Wed Jul 8 20:56:19 2015 +0200

Avoid loplugin:redundantcast in non-debug build

Change-Id: Ib5f57ba5154c56b89ab550aef5a87ee27539ddd9

diff --git a/cppu/source/uno/prim.hxx b/cppu/source/uno/prim.hxx
index d168fe8..3fcdb13 100644
--- a/cppu/source/uno/prim.hxx
+++ b/cppu/source/uno/prim.hxx
@@ -130,17 +130,14 @@ inline typelib_TypeDescriptionReference * _getVoidType()
 return g_pVoidType;
 }
 
-
+inline void CONSTRUCT_EMPTY_ANY(uno_Any * pAny) {
+pAny->pType = _getVoidType();
 #if OSL_DEBUG_LEVEL > 0
-#define CONSTRUCT_EMPTY_ANY( pAny ) \
-(pAny)->pType = _getVoidType(); \
-(pAny)->pData = reinterpret_cast(0xdeadbeef);
+pAny->pData = reinterpret_cast(0xdeadbeef);
 #else
-#define CONSTRUCT_EMPTY_ANY( pAny ) \
-(pAny)->pType = _getVoidType(); \
-(pAny)->pData = (pAny);
+pAny->pData = pAny;
 #endif
-
+}
 
 #define TYPE_ACQUIRE( pType ) \
 osl_atomic_increment( &(pType)->nRefCount );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/chart-sidebar' - 5 commits - chart2/source include/sfx2 offapi/com sfx2/source

[Markus Mohrhard]

 chart2/source/controller/main/ChartController.cxx |   31 ++
 chart2/source/controller/main/ChartController.hxx |2 
 include/sfx2/sidebar/ResourceManager.hxx  |   10 +--
 include/sfx2/sidebar/SidebarController.hxx|8 ++
 include/sfx2/sidebar/Tools.hxx|2 
 include/sfx2/sidebar/UnoSidebar.hxx   |4 +
 offapi/com/sun/star/ui/XSidebarProvider.idl   |6 ++
 sfx2/source/sidebar/ControllerFactory.cxx |2 
 sfx2/source/sidebar/ResourceManager.cxx   |   18 +++---
 sfx2/source/sidebar/SidebarController.cxx |   63 ++
 sfx2/source/sidebar/Tools.cxx |6 +-
 sfx2/source/sidebar/UnoDecks.cxx  |4 -
 sfx2/source/sidebar/UnoPanels.cxx |4 -
 sfx2/source/sidebar/UnoSidebar.cxx|6 ++
 14 files changed, 118 insertions(+), 48 deletions(-)

New commits:
commit e6c00e5d38cee1310bf8587f6680da402405ef19
Author: Markus Mohrhard 
Date:   Wed Jul 8 20:45:37 2015 +0200

finally manage to register chart2 in the ChartController

We need to do some jumps through pink hoops to connect the chart
controller with the host sidebar.

Would we use the chart window as parent for our sidebar the sidebar
would be directlz beside the chart and not at the border of the host
window.

Change-Id: Ica44ae370518882ef367999f57251b1256907016

diff --git a/chart2/source/controller/main/ChartController.cxx 
b/chart2/source/controller/main/ChartController.cxx
index 4156c9d..3175eea 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -51,6 +51,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -58,6 +59,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -66,6 +68,8 @@
 #include 
 #include 
 
+#include 
+
 #include 
 #include 
 
@@ -346,6 +350,21 @@ uno::Sequence< OUString > 
ChartController::getSupportedServiceNames_Static()
 return aSNS;
 }
 
+namespace {
+
+uno::Reference getSidebarFromModel(uno::Reference 
xModel)
+{
+uno::Reference xChild(xModel, uno::UNO_QUERY);
+uno::Reference xParent (xChild->getParent(), 
uno::UNO_QUERY_THROW);
+uno::Reference 
xController(xParent->getCurrentController(), uno::UNO_QUERY);
+uno::Reference xSidebarProvider 
(xController->getSidebar(), uno::UNO_QUERY);
+uno::Reference xSidebar(xSidebarProvider->getSidebar(), 
uno::UNO_QUERY);
+
+return xSidebar;
+}
+
+}
+
 // XController
 
 void SAL_CALL ChartController::attachFrame(
@@ -359,6 +378,10 @@ void SAL_CALL ChartController::attachFrame(
 
 mpSelectionChangeHandler->Connect();
 
+uno::Reference xSidebar = getSidebarFromModel(getModel());
+sfx2::sidebar::SidebarController* pSidebar = 
dynamic_cast(xSidebar.get());
+sfx2::sidebar::SidebarController::registerSidebarForFrame(pSidebar, this);
+
 if(m_xFrame.is()) //what happens, if we do have a Frame already??
 {
 //@todo? throw exception?
@@ -725,6 +748,14 @@ void SAL_CALL ChartController::dispose()
 throw(uno::RuntimeException, std::exception)
 {
 mpSelectionChangeHandler->Disconnect();
+
+if (getModel().is())
+{
+uno::Reference xSidebar = 
getSidebarFromModel(getModel());
+sfx2::sidebar::SidebarController* pSidebar = 
dynamic_cast(xSidebar.get());
+sfx2::sidebar::SidebarController::unregisterSidebarForFrame(pSidebar, 
this);
+}
+
 try
 {
 //This object should release all resources and references in the
diff --git a/include/sfx2/sidebar/SidebarController.hxx 
b/include/sfx2/sidebar/SidebarController.hxx
index 6d88767..bdc1dc4 100644
--- a/include/sfx2/sidebar/SidebarController.hxx
+++ b/include/sfx2/sidebar/SidebarController.hxx
@@ -69,7 +69,7 @@ class SidebarDockingWindow;
 class TabBar;
 class TabBarConfiguration;
 
-class SidebarController
+class SFX2_DLLPUBLIC SidebarController
 : private ::boost::noncopyable,
   private ::cppu::BaseMutex,
   public SidebarControllerInterfaceBase
commit d97e0e3ca9e66a0fd8cb6bfdf8faa94de24ef408
Author: Markus Mohrhard 
Date:   Wed Jul 8 20:35:21 2015 +0200

[API CHANGE] add way to get XSidebar from XSidebarProvider

Change-Id: I9fcf1cffa70eac6fec228ca4a9d4d32783295f21

diff --git a/include/sfx2/sidebar/UnoSidebar.hxx 
b/include/sfx2/sidebar/UnoSidebar.hxx
index 6c154c0..9cbb4e1 100644
--- a/include/sfx2/sidebar/UnoSidebar.hxx
+++ b/include/sfx2/sidebar/UnoSidebar.hxx
@@ -14,6 +14,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -56,6 +57,9 @@ public:
 virtual css::uno::Reference SAL_CALL getDecks()
 throw(css::uno::RuntimeException, 
std::exception) SAL_OVERRIDE;
 
+virtual css::uno::Reference SAL_CALL getSidebar()
+throw(css::uno::RuntimeException, 
std::exception) SAL_OVERRIDE;
+
 };
 
 #en

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source include/editeng include/svx svx/source

[matteocam]

 editeng/source/outliner/outliner.cxx   |5 
 editeng/source/outliner/overflowingtxt.cxx |   31 -
 include/editeng/overflowingtxt.hxx |   27 ++---
 include/svx/textchainflow.hxx  |2 -
 svx/source/svdraw/textchainflow.cxx|8 ++-
 5 files changed, 45 insertions(+), 28 deletions(-)

New commits:
commit 7b5adb6f56dcd448cb2f92dd9dc679abb1479d50
Author: matteocam 
Date:   Wed Jul 8 14:41:58 2015 -0400

Add Selection getters to (Non)OverflowingText

Change-Id: Ia5f485c3f3adf6ae0cab3cf12ebb1119048eec83

diff --git a/editeng/source/outliner/outliner.cxx 
b/editeng/source/outliner/outliner.cxx
index 301ee0c..2b03d26 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -2144,7 +2144,6 @@ NonOverflowingText *Outliner::GetNonOverflowingText() 
const
 nLen += GetLineLen(nOverflowingPara, nLine);
 }
 
-/* BEGIN Experiment with ESelection and EditTextobject */
 sal_Int32 nStartPara = 0;
 sal_Int32 nStartPos = 0;
 ESelection aNonOverflowingTextSelection;
@@ -2201,7 +2200,6 @@ OverflowingText *Outliner::GetOverflowingText() const
 nLen += GetLineLen(nHeadPara, nLine);
 }
 
-/* BEGIN experiment ESEL */
 sal_uInt32 nOverflowingPara = pEditEngine->GetOverflowingParaNum();
 ESelection aOverflowingTextSel;
 sal_Int32 nLastPara = nParaCount-1;
@@ -2211,9 +2209,6 @@ OverflowingText *Outliner::GetOverflowingText() const
 
 EditTextObject *pTObj = pEditEngine->CreateTextObject(aOverflowingTextSel);
 return new OverflowingText(pTObj);
-
-/* END experiment ESel */
-
 }
 
 void Outliner::ClearOverflowingParaNum()
diff --git a/editeng/source/outliner/overflowingtxt.cxx 
b/editeng/source/outliner/overflowingtxt.cxx
index 77f4829..03ed385 100644
--- a/editeng/source/outliner/overflowingtxt.cxx
+++ b/editeng/source/outliner/overflowingtxt.cxx
@@ -23,6 +23,28 @@
 #include 
 #include 
 #include 
+#include 
+
+ESelection getLastPositionSel(const EditTextObject *pTObj)
+{
+sal_Int32 nLastPara = pTObj->GetParagraphCount()-1;
+// If text is empty
+if (nLastPara < 0 )
+nLastPara = 0;
+sal_Int32 nLen = pTObj->GetText(nLastPara).getLength();
+ESelection aEndPos(nLastPara, nLen, nLastPara, nLen);
+
+return aEndPos;
+}
+
+OverflowingText::OverflowingText(EditTextObject *pTObj) : 
mpContentTextObj(pTObj)
+{
+}
+
+ESelection OverflowingText::GetInsertionPointSel() const
+{
+return getLastPositionSel(mpContentTextObj);
+}
 
 OutlinerParaObject *NonOverflowingText::ToParaObject(Outliner *pOutliner) const
 {
@@ -31,6 +53,11 @@ OutlinerParaObject 
*NonOverflowingText::ToParaObject(Outliner *pOutliner) const
 return pPObj;
 }
 
+ESelection NonOverflowingText::GetOverflowPointSel() const
+{
+return getLastPositionSel(mpContentTextObj);
+}
+
 // The equivalent of ToParaObject for OverflowingText. Here we are prepending 
the overflowing text to the old dest box's text
 // XXX: In a sense a better name for OverflowingText and NonOverflowingText 
are respectively DestLinkText and SourceLinkText
 OutlinerParaObject *OverflowingText::GetJuxtaposedParaObject(Outliner *pOutl, 
OutlinerParaObject *pNextPObj)
@@ -49,7 +76,7 @@ OutlinerParaObject 
*OverflowingText::GetJuxtaposedParaObject(Outliner *pOutl, Ou
 pOutl->SetText(*pOverflowingPObj);
 
 // Set selection position between new and old text
-maInsertionPointSel = impGetEndSelection(pOutl);
+//maInsertionPointSel = impGetEndSelection(pOutl);  // XXX: Maybe setting 
in the constructor is just right
 
 pOutl->AddText(*pNextPObj);
 
@@ -60,6 +87,7 @@ OutlinerParaObject 
*OverflowingText::GetJuxtaposedParaObject(Outliner *pOutl, Ou
 return pPObj;
 }
 
+/*
 ESelection OverflowingText::impGetEndSelection(Outliner *pOutl) const
 {
 const sal_Int32 nParaCount = pOutl->GetParagraphCount();
@@ -70,6 +98,7 @@ ESelection OverflowingText::impGetEndSelection(Outliner 
*pOutl) const
 ESelection 
aEndSel(nLastParaIndex,nLenLastPara,nLastParaIndex,nLenLastPara);
 return aEndSel;
 }
+* */
 
 /*
 OUString OverflowingText::GetEndingLines() const
diff --git a/include/editeng/overflowingtxt.hxx 
b/include/editeng/overflowingtxt.hxx
index be5530b..7faa9a9 100644
--- a/include/editeng/overflowingtxt.hxx
+++ b/include/editeng/overflowingtxt.hxx
@@ -36,14 +36,6 @@ class OverflowingText
 {
 
 public:
-// Constructor
-
-OverflowingText(EditTextObject *pTObj) : mpContentTextObj(pTObj)
-{
-ESelection aStartPos(0,0,0,0);
-maInsertionPointSel = aStartPos;
-}
-
 OutlinerParaObject *GetJuxtaposedParaObject(Outliner *, 
OutlinerParaObject *);
 ESelection GetInsertionPointSel() const;
 
@@ -52,25 +44,26 @@ public:
 //bool HasOtherParas() const { return !(mTailTxt == "" && mpMidParas 
== NULL); }
 
 private:
+friend class Outliner;
+// Construct

[Libreoffice-commits] core.git: Branch 'private/jmux/kde4-vcl-5-0-fix' - 13 commits - cui/source dtrans/source include/sal include/sot include/svx officecfg/registry sc/sdi sc/source sd/sdi sd/source

[Jan-Marek Glogowski]

Rebased ref, commits from common ancestor:
commit eb25920fa93a3b3c454c74d88c29f7d46a17eefd
Author: Jan-Marek Glogowski 
Date:   Wed Jul 8 18:02:00 2015 +

tdf#92115 KDE4: better listbox theming

I realized most combo boxes are list boxes, as their entries
aren't editable.

Change-Id: Ic83b8209208fddafe34e04f4e5e531f0d28e62bd

diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index 55524da..985969e 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -418,24 +418,21 @@ bool KDESalGraphics::drawNativeControl( ControlType type, 
ControlPart part,
 }
 else if (type == CTRL_LISTBOX)
 {
-if( part == PART_WINDOW )
-{
-lcl_drawFrame( QStyle::PE_Frame, m_image,
-   vclStateValue2StateFlag(nControlState, value) );
-}
-else
-{
-QStyleOptionComboBox option;
-if (part == PART_SUB_EDIT)
-{
+QStyleOptionComboBox option;
+switch (part) {
+case PART_SUB_EDIT:
 draw( QStyle::CE_ComboBoxLabel, &option, m_image,
   vclStateValue2StateFlag(nControlState, value) );
-}
-else
-{
+break;
+case PART_ENTIRE_CONTROL:
 draw( QStyle::CC_ComboBox, &option, m_image,
   vclStateValue2StateFlag(nControlState, value) );
-}
+break;
+case PART_BUTTON_DOWN:
+option.subControls = QStyle::SC_ComboBoxArrow;
+draw( QStyle::CC_ComboBox, &option, m_image,
+  vclStateValue2StateFlag(nControlState, value) );
+break;
 }
 }
 else if (type == CTRL_LISTNODE)
@@ -653,6 +650,12 @@ bool KDESalGraphics::getNativeControlRegion( ControlType 
type, ControlPart part,
  const OUString&,
  Rectangle &nativeBoundingRegion, 
Rectangle &nativeContentRegion )
 {
+bool nativeSupport = IsNativeControlSupported( type, part );
+if( ! nativeSupport ) {
+assert( ! nativeSupport && "drawNativeControl called without native 
support!" );
+return false;
+}
+
 bool retVal = false;
 
 QRect boundingRect = region2QRect( controlRegion );
@@ -734,8 +737,6 @@ bool KDESalGraphics::getNativeControlRegion( ControlType 
type, ControlPart part,
 {
 case PART_ENTIRE_CONTROL:
 {
-int size = 
QApplication::style()->pixelMetric(QStyle::PM_ComboBoxFrameWidth) - 2;
-
 // find out the minimum size that should be used
 // assume contents is a text ling
 int nHeight = QApplication::fontMetrics().height();
@@ -748,8 +749,10 @@ bool KDESalGraphics::getNativeControlRegion( ControlType 
type, ControlPart part,
 // FIXME: why this difference between comboboxes and 
listboxes ?
 // because a combobox has a sub edit and that is positioned
 // inside the outer bordered control ?
-if( type == CTRL_COMBOBOX )
+if( type == CTRL_COMBOBOX ) {
+int size = 
QApplication::style()->pixelMetric(QStyle::PM_ComboBoxFrameWidth) - 2;
 contentRect.adjust(-size,-size,size,size);
+}
 retVal = true;
 break;
 }
@@ -762,13 +765,22 @@ bool KDESalGraphics::getNativeControlRegion( ControlType 
type, ControlPart part,
 retVal = true;
 break;
 case PART_SUB_EDIT:
+{
 contentRect = QApplication::style()->subControlRect(
 QStyle::CC_ComboBox, &cbo, 
QStyle::SC_ComboBoxEditField );
 
-contentRect.translate( boundingRect.left(), 
boundingRect.top() );
+int hmargin = QApplication::style()->pixelMetric(
+QStyle::PM_FocusFrameHMargin, &styleOption);
+int vmargin = QApplication::style()->pixelMetric(
+QStyle::PM_FocusFrameVMargin, &styleOption);
+
+contentRect.translate( boundingRect.left() + hmargin, 
boundingRect.top() + vmargin );
+contentRect.adjust( 0, 0, -2 * hmargin, -2 * vmargin );
+boundingRect = contentRect;
 
 retVal = true;
 break;
+}
 case PART_WINDOW:
 retVal = true;
 break;
commit bc7761f27661ea64920258445fff6d83e9e9983b
Author: Jan-Marek Glogowski 
Date:   Wed Jul 8 17:59:14 2015 +

KDE4: Switch default image color to transparent

Just fill the image _once

[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-3' - 2 commits - loleaflet/Makefile

[Tor Lillqvist]

 loleaflet/Makefile |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1054ec3aa5518d524bc63a7baf6bc39991851dfb
Author: Tor Lillqvist 
Date:   Wed Jul 8 20:01:37 2015 +0300

Bump version to 1.1.9 after tarball

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 93340da..7c9b024 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -1,6 +1,6 @@
 # Version number of loleaflet, no need to be in sync with the loolwsd one
 
-VERSION=1.1.8
+VERSION=1.1.9
 
 # Version number of the bundled 'draw' thing
 DRAW_VERSION=0.2.4
commit bd6d5db1ab76788eb068210e184fedc967df4936
Author: Tor Lillqvist 
Date:   Wed Jul 8 19:50:41 2015 +0300

Bump version to 1.1.8 for tarball (and packaging)

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 16764c4..93340da 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -1,6 +1,6 @@
 # Version number of loleaflet, no need to be in sync with the loolwsd one
 
-VERSION=1.1.7
+VERSION=1.1.8
 
 # Version number of the bundled 'draw' thing
 DRAW_VERSION=0.2.4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc-tiled-rendering' - libreofficekit/qa libreofficekit/source

[Pranav Kant]

Rebased ref, commits from common ancestor:
commit 9ef8b40815d6645dfc272d4ecb403f9f583fd000
Author: Pranav Kant 
Date:   Tue Jul 7 21:16:45 2015 +0530

lokdocview: Emit load-changed signal showing load progress

Change-Id: I69b4c05d12c0c0b2ca6b7d1ad76ed74cc1f4346a

diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx 
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index af3ba41..3b30e53 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -30,6 +30,7 @@ static int help()
 }
 
 static GtkWidget* pDocView;
+static GtkWidget* pStatusBar;
 static GtkToolItem* pEnableEditing;
 static GtkToolItem* pBold;
 static GtkToolItem* pItalic;
@@ -286,6 +287,12 @@ static void signalCommand(LOKDocView* /*pLOKDocView*/, 
char* pPayload, gpointer
 }
 }
 
+static void loadChanged(LOKDocView* /*pLOKDocView*/, gdouble fValue, gpointer 
pData)
+{
+GtkWidget* pProgressBar = GTK_WIDGET (pData);
+gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(pProgressBar), fValue);
+}
+
 /// LOKDocView found no search matches -> set the search label accordingly.
 static void signalSearch(LOKDocView* /*pLOKDocView*/, char* /*pPayload*/, 
gpointer /*pData*/)
 {
@@ -402,6 +409,8 @@ static void openDocumentCallback (GObject* source_object, 
GAsyncResult* res, gpo
 
 focusChain = g_list_append( focusChain, pDocView1 );
 gtk_container_set_focus_chain ( GTK_CONTAINER (pVBox), focusChain );
+
+gtk_widget_hide (pStatusBar);
 }
 
 int main( int argc, char* argv[] )
@@ -554,6 +563,7 @@ int main( int argc, char* argv[] )
 g_signal_connect(pDocView, "part-changed", G_CALLBACK(signalPart), NULL);
 g_signal_connect(pDocView, "hyperlink-clicked", 
G_CALLBACK(signalHyperlink), NULL);
 
+
 // Scrolled window for DocView
 pScrolledWindow = gtk_scrolled_window_new(0, 0);
 gtk_widget_set_hexpand (pScrolledWindow, TRUE);
@@ -562,6 +572,13 @@ int main( int argc, char* argv[] )
 
 gtk_container_add(GTK_CONTAINER(pScrolledWindow), pDocView);
 
+GtkWidget* pProgressBar = gtk_progress_bar_new ();
+g_signal_connect(pDocView, "load-changed", G_CALLBACK(loadChanged), 
pProgressBar);
+
+pStatusBar = gtk_statusbar_new ();
+gtk_container_add (GTK_CONTAINER(pVBox), pStatusBar);
+gtk_container_add (GTK_CONTAINER(pStatusBar), pProgressBar);
+
 gtk_widget_show_all( pWindow );
 // Hide the findbar by default.
 gtk_widget_hide(pFindbar);
diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 2812ca0..0ab7f6e 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -40,7 +40,7 @@ struct _LOKDocViewPrivate
 {
 gchar* m_aLOPath;
 gchar* m_aDocPath;
-guint m_nLoadProgress;
+gdouble m_nLoadProgress;
 gboolean m_bIsLoading;
 gboolean m_bCanZoomIn;
 gboolean m_bCanZoomOut;
@@ -108,6 +108,7 @@ struct _LOKDocViewPrivate
 
 enum
 {
+LOAD_CHANGED,
 EDIT_CHANGED,
 COMMAND_CHANGED,
 SEARCH_NOT_FOUND,
@@ -341,17 +342,20 @@ globalCallback (gpointer pData)
 {
 case LOK_CALLBACK_STATUS_INDICATOR_START:
 {
-priv->m_nLoadProgress = 0;
+priv->m_nLoadProgress = 0.0;
+g_signal_emit (pCallback->m_pDocView, doc_view_signals[LOAD_CHANGED], 
0, 0.0);
 }
 break;
 case LOK_CALLBACK_STATUS_INDICATOR_SET_VALUE:
 {
-priv->m_nLoadProgress = std::stoi(pCallback->m_aPayload);
+priv->m_nLoadProgress = 
static_cast(std::stoi(pCallback->m_aPayload)/100.0);
+g_signal_emit (pCallback->m_pDocView, doc_view_signals[LOAD_CHANGED], 
0, priv->m_nLoadProgress);
 }
 break;
 case LOK_CALLBACK_STATUS_INDICATOR_FINISH:
 {
-priv->m_nLoadProgress = 100;
+priv->m_nLoadProgress = 1.0;
+g_signal_emit (pCallback->m_pDocView, doc_view_signals[LOAD_CHANGED], 
0, 1.0);
 }
 break;
 default:
@@ -1069,7 +1073,7 @@ static void lok_doc_view_get_property (GObject* object, 
guint propId, GValue *va
 g_value_set_boolean (value, priv->m_bEdit);
 break;
 case PROP_LOAD_PROGRESS:
-g_value_set_uint (value, priv->m_nLoadProgress);
+g_value_set_double (value, priv->m_nLoadProgress);
 break;
 case PROP_ZOOM:
 g_value_set_float (value, priv->m_fZoom);
@@ -1210,11 +1214,11 @@ static void lok_doc_view_class_init (LOKDocViewClass* 
pClass)
  */
 g_object_class_install_property (pGObjectClass,
   PROP_LOAD_PROGRESS,
-  g_param_spec_int("load-progress",
-   "Estimated Load Progress",
-   "Whether the content is in edit mode or not",
-   0, 100, 0,
-   G_PARAM_READABLE));
+  g_param_spec_double("load-progress",
+  "Estimated Load Progress",
+  "Shows the progress of the document load 

[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-3' - loleaflet/src

[Mihai Varga]

 loleaflet/src/layer/tile/TileLayer.js |   38 +++---
 1 file changed, 22 insertions(+), 16 deletions(-)

New commits:
commit c19c7e305353a5536103f4157c7ddbab04586edf
Author: Mihai Varga 
Date:   Tue Jul 7 19:20:22 2015 +0300

loleaflet: send click event before doubleclick

Also, the click event is now fired instantly, previously we would've
waited 250ms to see if a dblclick occurs and we would cancel the first
2 clicks

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index dad1cea..0f97438 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -742,29 +742,35 @@ L.TileLayer = L.GridLayer.extend({
clearTimeout(this._holdMouseEvent);
this._holdMouseEvent = null;
}
-   if (this._mouseEventsQueue.length === 3) {
-   // i.e. we have mousedown, mouseup, mousedown 
and here comes another
-   // mouseup. Those are 2 consecutive clicks == 
doubleclick, we cancel
-   // everything and wait for the dblclick event 
to arrive where it's handled
+   if (this._clickTime && Date.now() - this._clickTime <= 
250) {
+   // double click, a click was sent already
+   this._mouseEventsQueue = [];
+   return;
+   }
+   else {
+   // if it's a click or mouseup after selecting
+   if (this._mouseEventsQueue.length > 0 || 
this._editMode) {
+   this._clickTime = Date.now();
+   if (this._mouseEventsQueue.length > 0) {
+   // fire mousedown
+   this._mouseEventsQueue[0]();
+   }
+   this._mouseEventsQueue = [];
+   }
if (!this._editMode) {
this._editMode = true;
this._map.fire('updatemode:edit');
}
-   this._mouseEventsQueue = [];
-   return;
-   }
-   mousePos = this._latLngToTwips(e.latlng);
-   this._mouseEventsQueue.push(L.bind(function() {
+   mousePos = this._latLngToTwips(e.latlng);
this._postMouseEvent('buttonup', mousePos.x, 
mousePos.y, 1);
this._textArea.focus();
-   }, this));
-   this._holdMouseEvent = 
setTimeout(L.bind(this._executeMouseEvents, this), 250);
 
-   if (this._startMarker._icon) {
-   L.DomUtil.removeClass(this._startMarker._icon, 
'leaflet-not-clickable');
-   }
-   if (this._endMarker._icon) {
-   L.DomUtil.removeClass(this._endMarker._icon, 
'leaflet-not-clickable');
+   if (this._startMarker._icon) {
+   
L.DomUtil.removeClass(this._startMarker._icon, 'leaflet-not-clickable');
+   }
+   if (this._endMarker._icon) {
+   
L.DomUtil.removeClass(this._endMarker._icon, 'leaflet-not-clickable');
+   }
}
}
else if (e.type === 'mousemove' && this._mouseDown) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: translations

[Eike Rathke]

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

New commits:
commit fbf9858a60120a7fc8e1ca4045bbcd6091c614df
Author: Eike Rathke 
Date:   Wed Jul 8 18:40:10 2015 +0200

Updated core
Project: translations  5fbe7f221f27df62d1156763f03baa90322c366b

interim typo fix NETTORABEITSTAGE -> NETTOARBEITSTAGE

Misspelled spreadsheet function names are most ugly..

Change-Id: I73a1f611e66a1484d2a728d3339eff5a6cd852ac

diff --git a/translations b/translations
index f7efc4e..5fbe7f2 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit f7efc4ecf69cba536cd0391d4673e31226b1fe86
+Subproject commit 5fbe7f221f27df62d1156763f03baa90322c366b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: source/de

[Eike Rathke]

 source/de/formula/source/core/resource.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5fbe7f221f27df62d1156763f03baa90322c366b
Author: Eike Rathke 
Date:   Wed Jul 8 18:40:10 2015 +0200

interim typo fix NETTORABEITSTAGE -> NETTOARBEITSTAGE

Misspelled spreadsheet function names are most ugly..

Change-Id: I73a1f611e66a1484d2a728d3339eff5a6cd852ac

diff --git a/source/de/formula/source/core/resource.po 
b/source/de/formula/source/core/resource.po
index c9ffcab..f77c979 100644
--- a/source/de/formula/source/core/resource.po
+++ b/source/de/formula/source/core/resource.po
@@ -3134,7 +3134,7 @@ msgctxt ""
 "SC_OPCODE_NETWORKDAYS\n"
 "string.text"
 msgid "NETWORKDAYS"
-msgstr "NETTORABEITSTAGE"
+msgstr "NETTOARBEITSTAGE"
 
 #: core_resource.src
 msgctxt ""
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - set_soenv.in xmlsecurity/source xmlsecurity/util

[Pedro Giffuni]

 set_soenv.in  |2 ++
 xmlsecurity/source/xmlsec/nss/makefile.mk |   16 ++--
 xmlsecurity/util/makefile.mk  |6 +-
 3 files changed, 13 insertions(+), 11 deletions(-)

New commits:
commit 970b89f96ca14028328388cdc16077afd93647dc
Author: Pedro Giffuni 
Date:   Wed Jul 8 14:27:07 2015 +

NSS build fixes

Author: Don Lewis (truckman at FreeBSD)

diff --git a/set_soenv.in b/set_soenv.in
index 2b96d28..90a2217 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1867,6 +1867,8 @@ ToFile( "PKGFORMAT", "@PKGFORMAT@","e" );
 ToFile( "SYSTEM_STDLIBS","@SYSTEM_STDLIBS@",   "e" );
 ToFile( "SYSTEM_ZLIB",   "@SYSTEM_ZLIB@",  "e" );
 ToFile( "SYSTEM_NSS","@SYSTEM_NSS@",   "e" );
+ToFile( "NSS_CFLAGS","@NSS_CFLAGS@",   "e" );
+ToFile( "NSS_LIBS",  "@NSS_LIBS@", "e" );
 ToFile( "SYSTEM_OPENSSL","@SYSTEM_OPENSSL@",   "e" );
 ToFile( "OPENSSL_CFLAGS","@OPENSSL_CFLAGS@",   "e" );
 ToFile( "OPENSSL_LIBS",  "@OPENSSL_LIBS@", "e" );
diff --git a/xmlsecurity/source/xmlsec/nss/makefile.mk 
b/xmlsecurity/source/xmlsec/nss/makefile.mk
index 2c298ed..3001e24 100644
--- a/xmlsecurity/source/xmlsec/nss/makefile.mk
+++ b/xmlsecurity/source/xmlsec/nss/makefile.mk
@@ -44,15 +44,11 @@ CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
 
 .IF "$(SYSTEM_NSS)" != "YES"
 MOZ_INC = $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
-NSS_INC = $(MOZ_INC)$/nss
-NSPR_INC = $(MOZ_INC)$/nspr
+NSS_CFLAGS = -I$(MOZ_INC)$/nss
+NSPR_CFLAGS = -I$(MOZ_INC)$/nspr
 .ELIF "$(GUI)" == "OS2"
-NSS_INC = /@unixroot/usr/include/nss3
-NSPR_INC = /@unixroot/usr/include/nspr4
-.ELSE
-# TODO: better use pkgconfig to find the proper system include path
-NSS_INC = /usr/include/nss3
-NSPR_INC = /usr/include/nspr4
+NSS_CFLAGS = -I/@unixroot/usr/include/nss3
+NSPR_CFLAGS = I/@unixroot/usr/include/nspr4
 .ENDIF
 
 .IF "$(GUI)" == "WNT"
@@ -108,10 +104,10 @@ CDEFS += -DXMLSEC_NO_XSLT
 # --- Files 
 
 SOLARINC += \
- -I$(NSPR_INC) \
+ $(NSPR_CFLAGS) \
  -I$(PRJ)$/source$/xmlsec
 
-SOLARINC += -I$(NSS_INC)
+SOLARINC += $(NSS_CFLAGS)
 
 SLOFILES = \
 $(SLO)$/nssinitializer.obj \
diff --git a/xmlsecurity/util/makefile.mk b/xmlsecurity/util/makefile.mk
index 09857bd..f4b8f45 100644
--- a/xmlsecurity/util/makefile.mk
+++ b/xmlsecurity/util/makefile.mk
@@ -101,13 +101,17 @@ SHL2STDLIBS +=\
 SHL2STDLIBS +=-ldl
 .ENDIF
 
-.IF "$(ENABLE_NSS_MODULE)"=="YES" && "$(SYSTEM_NSS)"!="YES"
+.IF "$(ENABLE_NSS_MODULE)"=="YES"
+.IF "$(SYSTEM_NSS)"!="YES"
 .IF "$(NSPR_LIB)" != ""
 SHL2STDLIBS += $(NSPR_LIB)
 .ENDIF
 .IF "$(NSS_LIB)" != ""
 SHL2STDLIBS += $(NSS_LIB)
 .ENDIF
+.ELSE
+SHL2STDLIBS += $(NSS_LIBS)
+.ENDIF
 .ENDIF
 
 .IF "$(CRYPTO_ENGINE)" == "mscrypto"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 starmath/source/view.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 9f1682f4e752c4f9ea43a21d1e201b014a88aca8
Author: Stephan Bergmann 
Date:   Wed Jul 8 18:02:23 2015 +0200

various warnings

Change-Id: I1e4f6920601bad273b5255defc9377ef303083fc

diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 1c4ca54..c5ffc39 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -1669,7 +1669,7 @@ void SmViewShell::Execute(SfxRequest& rReq)
 SfxMedium* pClipboardMedium = new SfxMedium();
 pClipboardMedium->GetItemSet(); //generate initial 
itemset, not sure if necessary
 const SfxFilter* pMathFilter =
-
SfxFilter::GetFilterByName(OUString::createFromAscii(MATHML_XML));
+SfxFilter::GetFilterByName(MATHML_XML);
 pClipboardMedium->SetFilter(pMathFilter);
 pClipboardMedium->setStreamToLoadFrom(xStrm, true 
/*bIsReadOnly*/);
 InsertFrom(*pClipboardMedium);
@@ -1688,14 +1688,14 @@ void SmViewShell::Execute(SfxRequest& rReq)
 SfxMedium* pClipboardMedium = new SfxMedium();
 pClipboardMedium->GetItemSet(); //generates 
initial itemset, not sure if necessary
 const SfxFilter* pMathFilter =
-
SfxFilter::GetFilterByName(OUString::createFromAscii(MATHML_XML));
+SfxFilter::GetFilterByName(MATHML_XML);
 pClipboardMedium->SetFilter(pMathFilter);
 
 SvMemoryStream * pStrm;
 // The text to be imported might asserts encoding 
like 'encoding="utf-8"' but FORMAT_STRING is UTF-16.
 // Force encoding to UTF-16, if encoding exists.
 bool bForceUTF16 = false;
-sal_Int32 nPosL = aString.indexOf( 
OUString::createFromAscii("encoding=\""));
+sal_Int32 nPosL = aString.indexOf("encoding=\"");
 sal_Int32 nPosU = -1;
 if ( nPosL >= 0 && nPosL +10 < aString.getLength() 
)
 {
@@ -1708,12 +1708,12 @@ void SmViewShell::Execute(SfxRequest& rReq)
 }
 if ( bForceUTF16 )
 {
-OUString aNewString = aString.replaceAt( 
nPosL,nPosU-nPosL,OUString::createFromAscii("UTF-16"));
-pStrm = new SvMemoryStream( 
(void*)aNewString.getStr(), aNewString.getLength() * sizeof(sal_Unicode), 
StreamMode::READ);
+OUString aNewString = aString.replaceAt( 
nPosL,nPosU-nPosL,"UTF-16");
+pStrm = new SvMemoryStream( 
const_cast(aNewString.getStr()), aNewString.getLength() * 
sizeof(sal_Unicode), StreamMode::READ);
 }
 else
 {
-pStrm = new SvMemoryStream( 
(void*)aString.getStr(), aString.getLength() * sizeof(sal_Unicode), 
StreamMode::READ);
+pStrm = new SvMemoryStream( 
const_cast(aString.getStr()), aString.getLength() * 
sizeof(sal_Unicode), StreamMode::READ);
 }
 uno::Reference xStrm2( new 
::utl::OInputStreamWrapper(*pStrm) );
 pClipboardMedium->setStreamToLoadFrom(xStrm2, true 
/*bIsReadOnly*/);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 svx/source/sidebar/shadow/ShadowPropertyPanel.cxx |   56 +++---
 svx/source/sidebar/shadow/ShadowPropertyPanel.hxx |2 
 2 files changed, 29 insertions(+), 29 deletions(-)

New commits:
commit feab17bc3626b5d1585d91ce006b4b9105483c1f
Author: Stephan Bergmann 
Date:   Wed Jul 8 17:54:36 2015 +0200

various warnings

Change-Id: Id3a56d628088f19424bd6e0c8bf23b0ac6c64d25

diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx 
b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
index bfb1d0a..a027abc 100644
--- a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
+++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
@@ -28,6 +28,35 @@ using namespace css;
 using namespace css::uno;
 using sfx2::sidebar::Theme;
 
+namespace {
+
+sal_uInt32 ParseText(OUString const & sTmp)
+{
+if (sTmp.isEmpty())
+return 0;
+sal_Unicode nChar = sTmp[0];
+if( nChar == '-' )
+{
+if (sTmp.getLength() < 2)
+return 0;
+nChar = sTmp[1];
+}
+
+if( (nChar < '0') || (nChar > '9') )
+return 0;
+
+const LocaleDataWrapper& rLocaleWrapper( 
Application::GetSettings().GetLocaleDataWrapper() );
+const sal_Unicode cSep = rLocaleWrapper.getNumDecimalSep()[0];
+
+rtl_math_ConversionStatus eStatus;
+double fTmp = rtl::math::stringToDouble( sTmp, cSep, 0, &eStatus);
+if (eStatus != rtl_math_ConversionStatus_Ok)
+return 0;
+
+return fTmp;
+}
+
+}
 
 namespace svx { namespace sidebar {
 
@@ -171,33 +200,6 @@ IMPL_LINK_NOARG(ShadowPropertyPanel, 
ModifyShadowDistanceHdl)
 return 0;
 }
 
-sal_uInt32 ShadowPropertyPanel::ParseText(OUString sTmp)
-{
-if (sTmp.isEmpty())
-return 0;
-sal_Unicode nChar = sTmp[0];
-if( nChar == '-' )
-{
-if (sTmp.getLength() < 2)
-return 0;
-nChar = sTmp[1];
-}
-
-if( (nChar < '0') || (nChar > '9') )
-return 0;
-
-const LocaleDataWrapper& rLocaleWrapper( 
Application::GetSettings().GetLocaleDataWrapper() );
-const sal_Unicode cSep = rLocaleWrapper.getNumDecimalSep()[0];
-
-rtl_math_ConversionStatus eStatus;
-double fTmp = rtl::math::stringToDouble( sTmp, cSep, 0, &eStatus);
-if (eStatus != rtl_math_ConversionStatus_Ok)
-return 0;
-
-return fTmp;
-
-}
-
 void ShadowPropertyPanel::UpdateControls()
 {
 if(mpShowShadow->GetState() == TRISTATE_FALSE)
diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx 
b/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx
index c32f327..520e03d 100644
--- a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx
+++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx
@@ -65,7 +65,6 @@ private:
 VclPtrmpShadowTransSlider;
 VclPtr   mpShadowTransMetric;
 XColorListRef pColorList;
-bool bDisabled;
 
 ::sfx2::sidebar::ControllerItem maShadowController;
 ::sfx2::sidebar::ControllerItem maShadowTransController;
@@ -83,7 +82,6 @@ private:
 void InsertAngleValues();
 void SetTransparencyValue(long);
 void UpdateControls();
-sal_uInt32 ParseText(OUString pStr);
 DECL_LINK(ClickShadowHdl, void*);
 DECL_LINK(ModifyShadowColorHdl, void*);
 DECL_LINK(ModifyShadowTransMetricHdl, void*);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - include/svx svx/source

[matteocam]

 include/svx/textchain.hxx |5 +++--
 svx/source/svdraw/svdedxv.cxx |2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit bfc9fc2eaa7d27bcadc99aa1ea277a83abc69ef9
Author: matteocam 
Date:   Wed Jul 8 11:46:22 2015 -0400

Add and handle CursorChainEvent::NULL_EVENT

Change-Id: I051b2487593271a5b689ba586a6cc1619e77b4a6

diff --git a/include/svx/textchain.hxx b/include/svx/textchain.hxx
index 77e3b32..7920a72 100644
--- a/include/svx/textchain.hxx
+++ b/include/svx/textchain.hxx
@@ -84,7 +84,8 @@ enum class CursorChainingEvent
 {
 TO_NEXT_LINK,
 TO_PREV_LINK,
-UNCHANGED
+UNCHANGED,
+NULL_EVENT
 };
 
 /*
@@ -113,7 +114,7 @@ class ImpChainLinkProperties
 
 ImpChainLinkProperties() {
 INIT_CHAIN_PROP(NilChainingEvent, false)
-INIT_CHAIN_PROP(CursorEvent, CursorChainingEvent::UNCHANGED)
+INIT_CHAIN_PROP(CursorEvent, CursorChainingEvent::NULL_EVENT)
 INIT_CHAIN_PROP(PreChainingSel, ESelection(0,0,0,0));
 }
 
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 2b165c7..d893dab 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -553,7 +553,7 @@ void SdrObjEditView::ImpMoveCursorAfterChainingEvent()
 }
 
 // Reset event
-pTextChain->SetCursorEvent(pTextObj, CursorChainingEvent::UNCHANGED);
+pTextChain->SetCursorEvent(pTextObj, CursorChainingEvent::NULL_EVENT);
 
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

RTF User Group

[tracey002]

Do you know of a User's Group that discusses the use of RTF controls?
As a (green-horn / novice / non-expert) RTF User, I have questions about 
what to do and when to do it:

Example Question: I have an "English (Australia)" document
(\deflang3081)
Why would and "English" document use the _\deflang__*fe*_3081
control? (_\deflang*fe*N - Default language ID for __*East Asian
text*__ in Word_)

Please advise.
Thanks, Tracey


No virus found in this outgoing message.
Checked by AVG - www.avg.com
Version: 9.0.935 / Virus Database: 4365.1.1/9685 - Release Date: 07/07/15 
20:01:00




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

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

[Tomaž Vajngerl]

 vcl/opengl/gdiimpl.cxx |   25 ++---
 1 file changed, 18 insertions(+), 7 deletions(-)

New commits:
commit e1ab783539b495e12fc769ac493db3f5cebec106
Author: Tomaž Vajngerl 
Date:   Tue Jun 30 18:07:41 2015 +0900

opengl: draw rectangle lines with only one glDrawArrays call

Change-Id: I33e065fe6c084d0bed04ee99c447004fe573278a
Reviewed-on: https://gerrit.libreoffice.org/16859
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 2526cde..f56dd4a 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -1195,13 +1195,24 @@ void OpenGLSalGraphicsImpl::drawRect( long nX, long nY, 
long nWidth, long nHeigh
 
 if( UseSolid( mnLineColor ) )
 {
-const long nX1( nX );
-const long nY1( nY );
-const long nX2( nX + nWidth );
-const long nY2( nY + nHeight );
-const SalPoint aPoints[] = { { nX1, nY1 }, { nX2, nY1 },
- { nX2, nY2 }, { nX1, nY2 } };
-DrawLines( 4, aPoints, true ); // No need for AA.
+GLfloat fX1 = OPENGL_COORD_X(nX);
+GLfloat fY1 = OPENGL_COORD_Y(nY);
+GLfloat fX2 = OPENGL_COORD_X(nX + nWidth);
+GLfloat fY2 = OPENGL_COORD_Y(nY + nHeight);
+
+GLfloat pPoints[16];
+
+pPoints[0] = fX1;
+pPoints[1] = fY1;
+pPoints[2] = fX2;
+pPoints[3] = fY1;
+pPoints[4] = fX2;
+pPoints[5] = fY2;
+pPoints[6] = fX1;
+pPoints[7] = fY2;
+
+mpProgram->SetVertices(pPoints);
+glDrawArrays(GL_LINE_LOOP, 0, 4);
 }
 
 PostDraw();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl]

 vcl/source/opengl/OpenGLHelper.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 5de8f1559afafe4a5430142c305549223d467606
Author: Tomaž Vajngerl 
Date:   Fri Jul 3 14:38:24 2015 +0900

tdf#88831 fix inverted textures when OpenGL is enabled

GLX returns a wrong value if the y coords are inverted. Most other
programs don't even ask for this (gnome-shell for example) and just
assumes "true" (and this works because most relevant X servers work
like this). We make this more robust and assume true only if the
returned value is GLX_DONT_CARE (-1).

Change-Id: I4800b3364fd00f5f4a8f5a459472bfa8d97827ba
Reviewed-on: https://gerrit.libreoffice.org/16860
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/opengl/OpenGLHelper.cxx 
b/vcl/source/opengl/OpenGLHelper.cxx
index 3acb0c6..41881da 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -539,7 +539,11 @@ GLXFBConfig OpenGLHelper::GetPixmapFBConfig( Display* 
pDisplay, bool& bInverted
 }
 
 glXGetFBConfigAttrib( pDisplay, aFbConfigs[i], GLX_Y_INVERTED_EXT, 
&nValue );
-bInverted = nValue == True;
+
+// Looks like that X sends GLX_DONT_CARE but this usually means "true" 
for most
+// of the X implementations. Investigation on internet pointed that 
this could be
+// safely "true" all the time (for example gnome-shell always assumes 
"true").
+bInverted = nValue == True || nValue == int(GLX_DONT_CARE);
 
 break;
 }
___
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' - 9e/c2148653436be8612273439180749e71e2ce58

[Caolán McNamara]

 9e/c2148653436be8612273439180749e71e2ce58 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6c7ab046295527b98ca190c60e145e831e5cc5c2
Author: Caolán McNamara 
Date:   Wed Jul 8 16:34:27 2015 +0100

Notes added by 'git notes add'

diff --git a/9e/c2148653436be8612273439180749e71e2ce58 
b/9e/c2148653436be8612273439180749e71e2ce58
new file mode 100644
index 000..cdc065b
--- /dev/null
+++ b/9e/c2148653436be8612273439180749e71e2ce58
@@ -0,0 +1 @@
+merged as: 64bc8b45b5c23efc5fe57585a69aa4263aaf4e83
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl]

 vcl/opengl/gdiimpl.cxx |   63 -
 1 file changed, 32 insertions(+), 31 deletions(-)

New commits:
commit c2cdfb398dda20ae0bd71b8efe55994b88e40fb1
Author: Tomaž Vajngerl 
Date:   Tue Jun 30 18:03:34 2015 +0900

opengl: use common macro for conversion of coordinates

add macro OPENGL_COORD_X and OPENGL_COORD_Y to convert (normalize)
to opengl coordinates that need to be in between -1.0f, 1.0f.

Change-Id: Ide5c53e80fd9140d32883d44e6112b83a01fd111
Reviewed-on: https://gerrit.libreoffice.org/16858
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index e2512b6..2526cde 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -36,6 +36,9 @@
 
 #include 
 
+#define OPENGL_COORD_X(x) GLfloat((2.0 * double(x)) / GetWidth() - 1.0)
+#define OPENGL_COORD_Y(y) GLfloat(1.0 - (2.0 * double(y)) / GetHeight())
+
 OpenGLSalGraphicsImpl::OpenGLSalGraphicsImpl(SalGraphics& rParent, 
SalGeometryProvider *pProvider)
 : mpContext(0)
 , mrParent(rParent)
@@ -450,8 +453,8 @@ void OpenGLSalGraphicsImpl::DrawPoint( long nX, long nY )
 {
 GLfloat pPoint[2];
 
-pPoint[0] = 2 * nX / GetWidth() - 1.0f;
-pPoint[1] = 1.0f - 2 * nY / GetHeight();
+pPoint[0] = OPENGL_COORD_X(nX);
+pPoint[1] = OPENGL_COORD_Y(nY);
 
 mpProgram->SetVertices( pPoint );
 glDrawArrays( GL_POINTS, 0, 1 );
@@ -463,10 +466,10 @@ void OpenGLSalGraphicsImpl::DrawLine( double nX1, double 
nY1, double nX2, double
 {
 GLfloat pPoints[4];
 
-pPoints[0] = (2 * nX1) / GetWidth() - 1.0;
-pPoints[1] = 1.0f - 2 * nY1 / GetHeight();
-pPoints[2] = (2 * nX2) / GetWidth() - 1.0;;
-pPoints[3] = 1.0f - 2 * nY2 / GetHeight();
+pPoints[0] = OPENGL_COORD_X(nX1);
+pPoints[1] = OPENGL_COORD_Y(nY1);
+pPoints[2] = OPENGL_COORD_X(nX2);
+pPoints[3] = OPENGL_COORD_Y(nY2);
 
 mpProgram->SetVertices( pPoints );
 glDrawArrays( GL_LINES, 0, 2 );
@@ -483,10 +486,10 @@ void OpenGLSalGraphicsImpl::DrawLineAA( double nX1, 
double nY1, double nX2, doub
 {   // Horizontal/vertical, no need for AA, both points have normal color.
 GLfloat pPoints[4];
 
-pPoints[0] = (2 * nX1) / GetWidth() - 1.0;
-pPoints[1] = 1.0f - 2 * nY1 / GetHeight();
-pPoints[2] = (2 * nX2) / GetWidth() - 1.0;;
-pPoints[3] = 1.0f - 2 * nY2 / GetHeight();
+pPoints[0] = OPENGL_COORD_X(nX1);
+pPoints[1] = OPENGL_COORD_Y(nY1);
+pPoints[2] = OPENGL_COORD_X(nX2);
+pPoints[3] = OPENGL_COORD_Y(nY2);
 
 mpProgram->SetVertices( pPoints );
 // Still set up for the trivial "gradients", because presumably 
UseSolidAA() has been called.
@@ -620,18 +623,14 @@ void OpenGLSalGraphicsImpl::ImplDrawLineAA( double nX1, 
double nY1, double nX2,
 
 GLfloat vertices[]=
 {
-#define convertX( x ) GLfloat( (2 * (x)) / GetWidth()  - 1.0f)
-#define convertY( y ) GLfloat( 1.0f - (2 * (y)) / GetHeight())
-convertX(x1-tx-Rx), convertY(y1-ty-Ry), //fading edge1
-convertX(x2-tx-Rx), convertY(y2-ty-Ry),
-convertX(x1-tx),convertY(y1-ty),//core
-convertX(x2-tx),convertY(y2-ty),
-convertX(x1+tx),convertY(y1+ty),
-convertX(x2+tx),convertY(y2+ty),
-convertX(x1+tx+Rx), convertY(y1+ty+Ry), //fading edge2
-convertX(x2+tx+Rx), convertY(y2+ty+Ry)
-#undef convertX
-#undef convertY
+OPENGL_COORD_X(x1-tx-Rx), OPENGL_COORD_Y(y1-ty-Ry), //fading edge1
+OPENGL_COORD_X(x2-tx-Rx), OPENGL_COORD_Y(y2-ty-Ry),
+OPENGL_COORD_X(x1-tx),OPENGL_COORD_Y(y1-ty),//core
+OPENGL_COORD_X(x2-tx),OPENGL_COORD_Y(y2-ty),
+OPENGL_COORD_X(x1+tx),OPENGL_COORD_Y(y1+ty),
+OPENGL_COORD_X(x2+tx),OPENGL_COORD_Y(y2+ty),
+OPENGL_COORD_X(x1+tx+Rx), OPENGL_COORD_Y(y1+ty+Ry), //fading edge2
+OPENGL_COORD_X(x2+tx+Rx), OPENGL_COORD_Y(y2+ty+Ry)
 };
 
 GLfloat aTexCoord[16] = { 0, 0, 1, 0, 2, 1, 3, 1, 4, 1, 5, 1, 6, 0, 7, 0 };
@@ -673,8 +672,8 @@ void OpenGLSalGraphicsImpl::DrawConvexPolygon( sal_uInt32 
nPoints, const SalPoin
 
 for( i = 0, j = 0; i < nPoints; i++, j += 2 )
 {
-aVertices[j] = (2 * pPtAry[i].mnX) / GetWidth() - 1.0;
-aVertices[j+1] = 1.0 - (2 * pPtAry[i].mnY / GetHeight());
+aVertices[j]   = OPENGL_COORD_X(pPtAry[i].mnX);
+aVertices[j+1] = OPENGL_COORD_Y(pPtAry[i].mnY);
 }
 
 mpProgram->SetVertices( &aVertices[0] );
@@ -715,8 +714,8 @@ void OpenGLSalGraphicsImpl::DrawConvexPolygon( const 
Polygon& rPolygon, bool blo
 for( i = 0, j = 0; i < nPoints; i++, j += 2 )
 {
 const Point& rPt = rPolygon.GetPoint( i );
-aVertices[j] = (2 * rPt.X()) / GetWidth() - 1.0;
-aVertices[j+1] = 1.0 - (2 * rPt.Y() / GetHeight());
+aVertices[j]   = OPENGL_COORD_X(rPt.X());
+aVertices[j+1] = OPENGL_COORD

[Libreoffice-commits] core.git: cui/source include/svx officecfg/registry sc/sdi sc/source sd/sdi sd/source svx/Library_svx.mk svx/sdi svx/source svx/uiconfig svx/UIConfig_svx.mk

[Rishabh Kumar]

 cui/source/tabpages/tpshadow.cxx |5 
 include/svx/svxids.hrc   |6 
 officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |   32 
 sc/sdi/drawsh.sdi|8 
 sc/source/ui/app/typemap.cxx |2 
 sc/source/ui/drawfunc/drawsh.cxx |9 
 sd/sdi/_drvwsh.sdi   |   20 
 sd/source/ui/view/drviews2.cxx   |8 
 sd/source/ui/view/drviewsf.cxx   |4 
 svx/Library_svx.mk   |1 
 svx/UIConfig_svx.mk  |1 
 svx/sdi/svx.sdi  |  108 +++
 svx/sdi/svxitems.sdi |3 
 svx/source/sidebar/PanelFactory.cxx  |5 
 svx/source/sidebar/shadow/ShadowPropertyPanel.cxx|  383 +++
 svx/source/sidebar/shadow/ShadowPropertyPanel.hxx|   97 ++
 svx/source/svdraw/svdattr.cxx|4 
 svx/uiconfig/ui/sidebarshadow.ui |  210 ++
 18 files changed, 903 insertions(+), 3 deletions(-)

New commits:
commit cc43153f466135b959605add37ccd9443852c185
Author: Rishabh Kumar 
Date:   Fri Jun 19 18:55:43 2015 +0530

tdf#87702: Addition of Shadow sidebar tab

Change-Id: I75b368c0a8088926c765dbc46c6a4ce7c9d8b9f0
Reviewed-on: https://gerrit.libreoffice.org/16375
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index 67abb5d..dd6db29 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -41,7 +41,10 @@ const sal_uInt16 SvxShadowTabPage::pShadowRanges[] =
 SDRATTR_SHADOWCOLOR,
 SDRATTR_SHADOWTRANSPARENCE,
 SID_ATTR_FILL_SHADOW,
-SID_ATTR_FILL_SHADOW,
+SID_ATTR_SHADOW_COLOR,
+SID_ATTR_SHADOW_TRANSPARENCE,
+SID_ATTR_SHADOW_XDISTANCE,
+SID_ATTR_SHADOW_YDISTANCE,
 0
 };
 
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 81cecff..f59e3e4 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -1008,8 +1008,12 @@
 #define SID_PARASPACE_DECREASE  ( SID_SVX_START + 1146 
)
 
 #define SID_OBJECT_CROP ( SID_SVX_START + 1147 
)
+#define SID_ATTR_SHADOW_TRANSPARENCE( SID_SVX_START + 1148 
)
+#define SID_ATTR_SHADOW_COLOR   ( SID_SVX_START + 1149 
)
+#define SID_ATTR_SHADOW_XDISTANCE   ( SID_SVX_START + 1150 
)
+#define SID_ATTR_SHADOW_YDISTANCE   ( SID_SVX_START + 1151 
)
 
-#define SID_EDIT_POSTIT ( SID_SVX_START + 1148 
)
+#define SID_EDIT_POSTIT ( SID_SVX_START + 1152 
)
 
 // IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id
 #define SID_SVX_FIRSTFREE   (SID_EDIT_POSTIT + 1)
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index 653d826..e20b1b0 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -368,6 +368,38 @@
 
   
 
+  
+
+  Shadow
+
+
+  ShadowPropertyPanel
+
+
+  PropertyDeck
+
+
+  .uno:FormatArea
+
+
+  
+Calc,   Draw,   visible ;
+Calc,   OLE,hidden  ;
+DrawImpress,3DObject,   visible ;
+DrawImpress,Draw,   visible ;
+DrawImpress,Graphic,hidden  ;
+DrawImpress,TextObject, hidden  ;
+DrawImpress,OLE,hidden  ;
+  
+
+
+  
private:resource/toolpanel/SvxPanelFactory/ShadowPropertyPanel
+
+
+  300
+
+  
+
   
 
   Line
diff --git a/sc/sdi/drawsh.sdi b/sc/sdi/drawsh.sdi
index d4a1eec..7fb2639 100644
--- a/sc/sdi/drawsh.sdi
+++ b/sc/sdi/drawsh.sdi
@@ -72,6 +72,14 @@ interface TableDraw
 StateMethod = GetDrawAttrState;
 Export = FALSE;
 ]
+SID_ATTR_SHADOW_COLOR
+[   ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = 
FALSE; ]
+SID_ATTR_SHADOW_TRANSPARENCE
+[   ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = 
FALSE; ]
+SID_ATTR_SHADOW_XDISTANCE
+[   ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = 
FALSE; ]
+SID_ATTR_SHADOW_YDISTANCE
+[   ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Expo

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - include/svx svx/source

[matteocam]

 include/svx/textchainflow.hxx   |   16 
 svx/source/svdraw/svdedxv.cxx   |1 -
 svx/source/svdraw/textchainflow.cxx |   22 ++
 3 files changed, 26 insertions(+), 13 deletions(-)

New commits:
commit d59384c316e6a161ae86edcb8bfaa3b837ff33b8
Author: matteocam 
Date:   Wed Jul 8 11:30:31 2015 -0400

Change Cursor Info only in EditingTextChainFlow

Change-Id: Iaf21679f416607c8c59d1c88484a306727abd7cc

diff --git a/include/svx/textchainflow.hxx b/include/svx/textchainflow.hxx
index 70ff6e4..ade3404 100644
--- a/include/svx/textchainflow.hxx
+++ b/include/svx/textchainflow.hxx
@@ -20,6 +20,9 @@
 #ifndef INCLUDED_SVX_TEXTCHAINFLOW_HXX
 #define INCLUDED_SVX_TEXTCHAINFLOW_HXX
 
+
+#include 
+
 class SdrTextObj;
 class SdrOutliner;
 class NonOverflowingText;
@@ -59,10 +62,11 @@ class TextChainFlow {
 
 //  -- Protected Members --
 protected:
+CursorChainingEvent maCursorEvent;
 
 void impCheckForFlowEvents(SdrOutliner *, SdrOutliner *);
 
-TextChain *GetTextChain();
+TextChain *GetTextChain() const;
 
 virtual void impLeaveOnlyNonOverflowingText(SdrOutliner *);
 virtual void impMoveChainedTextToNextLink(SdrOutliner *);
@@ -77,7 +81,7 @@ class TextChainFlow {
 //  -- Private Members --
 private:
 
-void impUpdateCursorEvent(SdrOutliner *, bool);
+void impUpdateCursorInfo(SdrOutliner *, bool);
 
 SdrTextObj *mpTargetLink;
 SdrTextObj *mpNextLink;
@@ -92,6 +96,7 @@ class TextChainFlow {
 OFlowChainedText *mpOverflChText;
 UFlowChainedText *mpUnderflChText;
 
+// XXX: It would be nice to get rid of this
 bool mbOFisUFinduced;
 };
 
@@ -99,19 +104,22 @@ class TextChainFlow {
 // NOTE: EditingTextChainFlow might be strongly coupled with behavior in 
SdrTextObj::onChainingEvent
 class EditingTextChainFlow : public TextChainFlow
 {
-public:
+public:
 EditingTextChainFlow(SdrTextObj *);
 virtual void CheckForFlowEvents(SdrOutliner *) SAL_OVERRIDE;
 
 //virtual void ExecuteOverflow(SdrOutliner *, SdrOutliner *) SAL_OVERRIDE;
 
-protected:
+protected:
 virtual void impLeaveOnlyNonOverflowingText(SdrOutliner *) SAL_OVERRIDE;
 
 virtual void impSetTextForEditingOutliner(OutlinerParaObject *);
 
 virtual void impSetFlowOutlinerParams(SdrOutliner *, SdrOutliner *) 
SAL_OVERRIDE;
 
+private:
+void impBroadcasCursorInfo() const;
+
 };
 
 #endif // INCLUDED_SVX_TEXTCHAINFLOW_HXX
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 3b5f021..2b165c7 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -544,7 +544,6 @@ void SdrObjEditView::ImpMoveCursorAfterChainingEvent()
 case CursorChainingEvent::TO_NEXT_LINK:
 SdrEndTextEdit();
 SdrBeginTextEdit(pNextLink);
-
 //SdrEndTextEdit(true);
 //SdrBeginTextEdit(pNextLink, nullptr, nullptr, false, 
nullptr, nullptr, true, true);
 break;
diff --git a/svx/source/svdraw/textchainflow.cxx 
b/svx/source/svdraw/textchainflow.cxx
index 4b80ea4..2700bf3 100644
--- a/svx/source/svdraw/textchainflow.cxx
+++ b/svx/source/svdraw/textchainflow.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include 
 #include 
 #include 
 #include 
@@ -38,6 +37,8 @@ TextChainFlow::TextChainFlow(SdrTextObj *pChainTarget)
 
 mpOverflChText = NULL;
 mpUnderflChText = NULL;
+
+maCursorEvent = CursorChainingEvent::UNCHANGED;
 }
 
 
@@ -78,7 +79,7 @@ void TextChainFlow::impCheckForFlowEvents(SdrOutliner 
*pFlowOutl, SdrOutliner *p
 bOverflow = bIsPageOverflow && mpNextLink;
 bUnderflow = !bIsPageOverflow &&  mpNextLink && mpNextLink->HasText();
 
-impUpdateCursorEvent(pFlowOutl, bOverflow);
+impUpdateCursorInfo(pFlowOutl, bOverflow);
 
 if (pParamOutl != NULL)
 {
@@ -96,7 +97,7 @@ void TextChainFlow::impCheckForFlowEvents(SdrOutliner 
*pFlowOutl, SdrOutliner *p
 
 }
 
-void TextChainFlow::impUpdateCursorEvent(SdrOutliner *, bool bIsOverflow)
+void TextChainFlow::impUpdateCursorInfo(SdrOutliner *, bool bIsOverflow)
 {
 // XXX: Current implementation might create problems with UF-
 //  In fact UF causes a
@@ -105,12 +106,10 @@ void TextChainFlow::impUpdateCursorEvent(SdrOutliner *, 
bool bIsOverflow)
 if (bIsOverflow && !mbOFisUFinduced) {
 bool bCursorOut = true; // XXX: Should have real check
 if (bCursorOut) {
-GetTextChain()->SetCursorEvent(GetLinkTarget(),
- CursorChainingEvent::TO_NEXT_LINK);
+maCursorEvent = CursorChainingEvent::TO_NEXT_LINK;
 }
 } else {
-GetTextChain()->SetCursorEvent(GetLinkTarget(),
- CursorChainingEvent::UNCHANGED);
+maCursorEvent = CursorChainingEvent::UNCHANGED;
 }
 }
 
@@ -210,7 +209,7 @@ OutlinerParaObject 
*TextChainFlow::impGetMergedUnderflowParaObject(SdrOutliner *
 return mpUnderf

[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-3' - 3 commits - loolwsd/configure.ac loolwsd/loolwsd.service

[Tor Lillqvist]

 loolwsd/configure.ac|2 +-
 loolwsd/loolwsd.service |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 76fbcdf7ce5c55675aed5aa412cd90844acc9e66
Author: Tor Lillqvist 
Date:   Wed Jul 8 18:11:48 2015 +0300

Bump version to 1.1.7 after tarball

diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index d5777f2..cfcc00a 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([loolwsd], [1.1.6], [libreoff...@collabora.com])
+AC_INIT([loolwsd], [1.1.7], [libreoff...@collabora.com])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules])
 
commit fd03389082692dad372e9649da5aea3df5775bed
Author: Tor Lillqvist 
Date:   Wed Jul 8 18:02:47 2015 +0300

Bump version to 1.1.6 for tarball

diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index 4ce0d45..d5777f2 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([loolwsd], [1.1.5], [libreoff...@collabora.com])
+AC_INIT([loolwsd], [1.1.6], [libreoff...@collabora.com])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules])
 
commit fa48f9d2ca01555d418d478c4a9b47739ff70e5b
Author: Tor Lillqvist 
Date:   Tue Jun 9 20:15:55 2015 +0300

Use /opt/libreoffice5.0 to match LO 5.0 beta

Note that the LibreOffice version present on the build system, if any, has 
no
relation to the one the packaged binaries are supposed to run against. When
building RPM or Debian packages, we use the bundled copy of the 
LibreOfficeKit
headers we have here, and not ones from a LibreOffice source tree.

diff --git a/loolwsd/loolwsd.service b/loolwsd/loolwsd.service
index 526b272..19fb82c 100644
--- a/loolwsd/loolwsd.service
+++ b/loolwsd/loolwsd.service
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 EnvironmentFile=-/etc/sysconfig/loolwsd
-ExecStart=/usr/bin/loolwsd --systemplate=/opt/lool/systemplate 
--lotemplate=/opt/libreofficedev5.1 --childroot=/opt/lool/child-roots 
--numprespawns=5
+ExecStart=/usr/bin/loolwsd --systemplate=/opt/lool/systemplate 
--lotemplate=/opt/libreoffice5.0 --childroot=/opt/lool/child-roots 
--numprespawns=5
 User=lool
 KillMode=process
 Restart=always
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - dtrans/source include/sal include/sot officecfg/registry sot/source starmath/inc starmath/sdi starmath/source starmath/uiconfig vcl/unx

[Regina Henschel]

 dtrans/source/win32/ftransl/ftransl.cxx   |2 
 include/sal/log-areas.dox |1 
 include/sot/formats.hxx   |3 
 officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu |5 
 sot/source/base/exchange.cxx  |1 
 starmath/inc/starmath.hrc |1 
 starmath/sdi/smath.sdi|   23 +++
 starmath/sdi/smslots.sdi  |6 
 starmath/source/view.cxx  |   75 
++
 starmath/uiconfig/smath/menubar/menubar.xml   |1 
 vcl/unx/generic/dtrans/X11_selection.cxx  |6 
 11 files changed, 119 insertions(+), 5 deletions(-)

New commits:
commit 64bc8b45b5c23efc5fe57585a69aa4263aaf4e83
Author: Regina Henschel 
Date:   Wed Jul 8 12:31:43 2015 +

i#107734 Support for Math Input Panel in Windows 7

The patch introduces a new command .uno:ImportMathClipboard to module Math.
It imports MathML content from clipboard and transforms it to Starmath
It handles clipboard MIME type 'application/mathml+xml' and
plain text, which can be interpreted as MathML segment.
It partly solves issues #i14252, #i34781, and #i53509 too.
Review by: Hanya 
(cherry picked from commit 9ec2148653436be8612273439180749e71e2ce58)

Conflicts:
dtrans/source/win32/ftransl/ftransl.cxx
officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu
sot/inc/sot/formats.hxx
sot/source/base/exchange.cxx
starmath/sdi/smath.sdi
starmath/source/view.cxx

Change-Id: I6cb5e8f737ee2e39f9ce96aba841db347a8806e4

diff --git a/dtrans/source/win32/ftransl/ftransl.cxx 
b/dtrans/source/win32/ftransl/ftransl.cxx
index bc14f54..7fe0b55 100644
--- a/dtrans/source/win32/ftransl/ftransl.cxx
+++ b/dtrans/source/win32/ftransl/ftransl.cxx
@@ -458,6 +458,8 @@ void SAL_CALL CDataFormatTranslator::initTranslationTable()
 m_TranslTable.push_back(FormatEntry("image/bmp", "Windows Bitmap", NULL, 
CF_INVALID, CPPUTYPE_DEFAULT));
 //SotClipboardFormatId::PNG
 m_TranslTable.push_back(FormatEntry("image/png", "PNG", NULL, CF_INVALID, 
CPPUTYPE_DEFAULT));
+//SotClipboardFormatId::MATHML
+m_TranslTable.push_back(FormatEntry("application/mathml+xml", "MathML", 
NULL, CF_INVALID, CPPUTYPE_DEFAULT));
 //SotClipboardFormatId::DUMMY3
 
m_TranslTable.push_back(FormatEntry("application/x-openoffice-dummy3;windows_formatname=\"SO_DUMMYFORMAT_3\"",
 "SO_DUMMYFORMAT_3", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
 //SotClipboardFormatId::DUMMY4
diff --git a/include/sot/formats.hxx b/include/sot/formats.hxx
index cb2ee82..c85a10f 100644
--- a/include/sot/formats.hxx
+++ b/include/sot/formats.hxx
@@ -185,8 +185,9 @@ enum class SotClipboardFormatId : sal_uLong
 HC_GDIMETAFILE = 140,
 PNG= 141,
 STARWRITERGLOB_8_TEMPLATE = 142,
+MATHML = 143,
 // the point at which we start allocating "runtime" format IDs
-USER_END  = STARWRITERGLOB_8_TEMPLATE
+USER_END  = MATHML
 };
 
 /** Make it easier to iterate over format IDs */
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu
index 02c5b52..4d612cd 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu
@@ -43,6 +43,11 @@
   ~Import Formula...
 
   
+  
+
+  Import MathML from Clipboard
+
+  
   
 
   Fit To Window
diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx
index 8b3541f..599525d 100644
--- a/sot/source/base/exchange.cxx
+++ b/sot/source/base/exchange.cxx
@@ -201,6 +201,7 @@ namespace
 /*140 SotClipboardFormatId::GDIMETAFILE*/  { 
"application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"",
 "High Contrast GDIMetaFile", &cppu::UnoType>::get() },
 /*141 SotClipboardFormatId::PNG*/{ 
"image/png", "PNG Bitmap", &cppu::UnoType>::get() },
 /*142 SotClipboardFormatId::STARWRITERGLOB_8_TEMPLATE*/  { 
MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_TEMPLATE_ASCII, "Writer/Global 8 
Template", &cppu::UnoType>::get() },
+/*143 SotClipboardFormatId::MATHML*/   { "application/mathml+xml", 
"MathML", &::cppu::UnoType>::get() },
 };
 return &aInstance[0];
 }
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index 7196b26..6bf6e21 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -45,6 +45,7 @@
 #define SID_SYMBOLS (SID_SMA_START + 56)

[Libreoffice-commits] online.git: loolwsd/loolwsd.service

[Tor Lillqvist]

 loolwsd/loolwsd.service |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5bf98749ba88b206e68ecd31aeff7ef4f67cfb24
Author: Tor Lillqvist 
Date:   Tue Jun 9 20:15:55 2015 +0300

Use /opt/libreoffice5.0 to match LO 5.0 beta

Note that the LibreOffice version present on the build system, if any, has 
no
relation to the one the packaged binaries are supposed to run against. When
building RPM or Debian packages, we use the bundled copy of the 
LibreOfficeKit
headers we have here, and not ones from a LibreOffice source tree.

diff --git a/loolwsd/loolwsd.service b/loolwsd/loolwsd.service
index 526b272..19fb82c 100644
--- a/loolwsd/loolwsd.service
+++ b/loolwsd/loolwsd.service
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 EnvironmentFile=-/etc/sysconfig/loolwsd
-ExecStart=/usr/bin/loolwsd --systemplate=/opt/lool/systemplate 
--lotemplate=/opt/libreofficedev5.1 --childroot=/opt/lool/child-roots 
--numprespawns=5
+ExecStart=/usr/bin/loolwsd --systemplate=/opt/lool/systemplate 
--lotemplate=/opt/libreoffice5.0 --childroot=/opt/lool/child-roots 
--numprespawns=5
 User=lool
 KillMode=process
 Restart=always
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 sw/inc/pam.hxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 394c5057e2c2a10bc09504646eed1b80e3cb061c
Author: Michael Stahl 
Date:   Tue Jul 7 15:07:59 2015 +0200

sw: let's try some C++11 syntax for function pointers

Less ugly or just differently ugly? Hard to tell...

Change-Id: I1265f07f39ebbc65acfcc30242bc7cd7d46207e7
Reviewed-on: https://gerrit.libreoffice.org/16821
Tested-by: Jenkins 
Reviewed-by: Björn Michaelsen 
Reviewed-by: Michael Stahl 

diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index 40715b4..cce42c0 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -143,7 +143,9 @@ typedef SwMoveFnCollection* SwMoveFn;
 SW_DLLPUBLIC extern SwMoveFn fnMoveForward; ///< SwPam::Move()/Find() default 
argument.
 SW_DLLPUBLIC extern SwMoveFn fnMoveBackward;
 
-typedef bool (*SwGoInDoc)( SwPaM& rPam, SwMoveFn fnMove );
+// also works: using SwGoInDoc = bool (*) (SwPaM& rPam, SwMoveFn fnMove);
+// no works: using SwGoInDoc = [](SwPaM& rPam, SwMoveFn fnMove) -> bool;
+using SwGoInDoc = auto (*)(SwPaM& rPam, SwMoveFn fnMove) -> bool;
 SW_DLLPUBLIC extern SwGoInDoc fnGoDoc;
 extern SwGoInDoc fnGoSection;
 SW_DLLPUBLIC extern SwGoInDoc fnGoNode;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/jmux/kde4-vcl-5-0-fix' - vcl/unx

[Jan-Marek Glogowski]

 vcl/unx/kde4/KDESalGraphics.cxx |   37 +++--
 1 file changed, 19 insertions(+), 18 deletions(-)

New commits:
commit 310ed685c25b9631a075d728c380a9a9add21376
Author: Jan-Marek Glogowski 
Date:   Wed Jul 8 14:56:24 2015 +

test

Change-Id: Ia5b6cd25d1027569887fcacebcbd3db47eccd999

diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index cc320ae..282fdb6 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -109,6 +109,7 @@ bool KDESalGraphics::IsNativeControlSupported( ControlType 
type, ControlPart par
 
 case CTRL_LISTBOX:
 return (part == PART_ENTIRE_CONTROL
+ || part == PART_BUTTON_DOWN
  || part == PART_SUB_EDIT);
 
 case CTRL_SPINBOX:
@@ -247,7 +248,7 @@ bool KDESalGraphics::drawNativeControl( ControlType type, 
ControlPart part,
   widgetRect.height(),
   QImage::Format_ARGB32 );
 }
-m_image->fill(KApplication::palette().color(QPalette::Window).rgb());
+m_image->fill( Qt::transparent );
 
 QRegion* clipRegion = NULL;
 
@@ -260,6 +261,7 @@ bool KDESalGraphics::drawNativeControl( ControlType type, 
ControlPart part,
 }
 else if (type == CTRL_MENUBAR)
 {
+m_image->fill( KApplication::palette().color(QPalette::Window).rgb());
 if (part == PART_MENU_ITEM)
 {
 QStyleOptionMenuItem option;
@@ -286,6 +288,7 @@ bool KDESalGraphics::drawNativeControl( ControlType type, 
ControlPart part,
 }
 else if (type == CTRL_MENU_POPUP)
 {
+m_image->fill( KApplication::palette().color(QPalette::Window).rgb());
 OSL_ASSERT( part == PART_MENU_ITEM ? lastPopupRect.isValid() : 
!lastPopupRect.isValid());
 if( part == PART_MENU_ITEM )
 {
@@ -408,24 +411,22 @@ bool KDESalGraphics::drawNativeControl( ControlType type, 
ControlPart part,
 }
 else if (type == CTRL_LISTBOX)
 {
-if( part == PART_WINDOW )
-{
-lcl_drawFrame( QStyle::PE_Frame, m_image,
-   vclStateValue2StateFlag(nControlState, value) );
-}
-else
-{
-QStyleOptionComboBox option;
-if (part == PART_SUB_EDIT)
-{
+QStyleOptionComboBox option;
+switch (part) {
+case PART_SUB_EDIT:
 draw( QStyle::CE_ComboBoxLabel, &option, m_image,
   vclStateValue2StateFlag(nControlState, value) );
-}
-else
-{
+break;
+case PART_ENTIRE_CONTROL:
 draw( QStyle::CC_ComboBox, &option, m_image,
   vclStateValue2StateFlag(nControlState, value) );
-}
+break;
+case PART_BUTTON_DOWN:
+m_image->fill( Qt::transparent );
+option.subControls = QStyle::SC_ComboBoxArrow;
+draw( QStyle::CC_ComboBox, &option, m_image,
+  vclStateValue2StateFlag(nControlState, value) );
+break;
 }
 }
 else if (type == CTRL_LISTNODE)
@@ -745,10 +746,10 @@ bool KDESalGraphics::getNativeControlRegion( ControlType 
type, ControlPart part,
 // FIXME: why this difference between comboboxes and 
listboxes ?
 // because a combobox has a sub edit and that is positioned
 // inside the outer bordered control ?
-if( type == CTRL_COMBOBOX ) {
+//if( type == CTRL_COMBOBOX ) {
 int size = 
QApplication::style()->pixelMetric(QStyle::PM_ComboBoxFrameWidth) - 2;
-contentRect.adjust(-size,-size,size,size);
-}
+contentRect.adjust(0, 0, 2 * size, 2 * size);
+//}
 retVal = true;
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - 2 commits - include/svx svx/source

[matteocam]

 include/svx/textchain.hxx   |7 ++-
 svx/source/svdraw/svdedxv.cxx   |   19 +--
 svx/source/svdraw/textchain.cxx |1 +
 3 files changed, 16 insertions(+), 11 deletions(-)

New commits:
commit 849d8130c32ed8bd4016bd637eabaf8681615ee6
Author: matteocam 
Date:   Wed Jul 8 10:54:38 2015 -0400

Reset chaining cursor event after handling it

Change-Id: I6c03b4a4340e1ee0c7498dae78c8563b54ef191f

diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 2908ce7..3b5f021 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -553,6 +553,9 @@ void SdrObjEditView::ImpMoveCursorAfterChainingEvent()
 break;
 }
 
+// Reset event
+pTextChain->SetCursorEvent(pTextObj, CursorChainingEvent::UNCHANGED);
+
 }
 
 IMPL_LINK(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI)
commit 82183e28056e2e661801c9f549f4be9dcf2d4249
Author: matteocam 
Date:   Wed Jul 8 10:46:13 2015 -0400

Implemented PreChainingSel as a TextChain property

Change-Id: Ifec26d8c49b1471f7ae25deca962516f1480e0dc

diff --git a/include/svx/textchain.hxx b/include/svx/textchain.hxx
index efd52ef..77e3b32 100644
--- a/include/svx/textchain.hxx
+++ b/include/svx/textchain.hxx
@@ -20,6 +20,9 @@
 #ifndef INCLUDED_SVX_TEXTCHAIN_HXX
 #define INCLUDED_SVX_TEXTCHAIN_HXX
 
+#include 
+#include 
+
 /*
  * Properties can be accessed and set from a TextChain with:
  * - T TextChain::GetPROPNAME(SdrTextObj *)
@@ -66,7 +69,6 @@
 
 /* End Special Properties Macro */
 
-#include 
 
 class ImpChainLinkProperties;
 class SdrTextObj;
@@ -112,12 +114,14 @@ class ImpChainLinkProperties
 ImpChainLinkProperties() {
 INIT_CHAIN_PROP(NilChainingEvent, false)
 INIT_CHAIN_PROP(CursorEvent, CursorChainingEvent::UNCHANGED)
+INIT_CHAIN_PROP(PreChainingSel, ESelection(0,0,0,0));
 }
 
 private:
 // NOTE: Remember to set default value in contructor when adding field
 DECL_CHAIN_PROP(NilChainingEvent, bool)
 DECL_CHAIN_PROP(CursorEvent, CursorChainingEvent)
+DECL_CHAIN_PROP(PreChainingSel, ESelection)
 
 };
 
@@ -138,6 +142,7 @@ class TextChain {
 // Specific Link Properties
 DECL_CHAIN_PROP_INTERFACE(CursorEvent, CursorChainingEvent)
 DECL_CHAIN_PROP_INTERFACE(NilChainingEvent, bool)
+DECL_CHAIN_PROP_INTERFACE(PreChainingSel, ESelection)
 
 
 
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 3ca380d..2908ce7 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -500,12 +500,13 @@ IMPL_LINK_NOARG(SdrObjEditView,ImpChainingEventHdl)
 pTextChain->SetNilChainingEvent(pTextObj, true);
 
 // Save previous selection pos
-maPreChainingSel = new ESelection(pOLV->GetSelection());
+pTextChain->SetPreChainingSel(pTextObj, pOLV->GetSelection());
+//maPreChainingSel = new ESelection(pOLV->GetSelection());
 
 // trigger actual chaining
 pTextObj->onChainingEvent();
 
-maCursorEvent = new 
CursorChainingEvent(pTextChain->GetCursorEvent(pTextObj));
+//maCursorEvent = new 
CursorChainingEvent(pTextChain->GetCursorEvent(pTextObj));
 //SdrTextObj *pNextLink = pTextObj->GetNextLinkInChain();
 
 // NOTE: Must be called. Don't let the function return if you set 
it to true and not reset it
@@ -529,16 +530,16 @@ void SdrObjEditView::ImpMoveCursorAfterChainingEvent()
 if (!pTextObj->IsChainable() || !pTextObj->GetNextLinkInChain())
 return;
 
-if(!maCursorEvent || !maPreChainingSel)
-return;
 
 SdrTextObj *pNextLink = pTextObj->GetNextLinkInChain();
 OutlinerView* pOLV = GetTextEditOutlinerView();
 
-switch (*maCursorEvent) {
+TextChain *pTextChain = pTextObj->GetTextChain();
+
+switch ( pTextChain->GetCursorEvent(pTextObj) ) {
 
 case CursorChainingEvent::UNCHANGED:
-pOLV->SetSelection(*maPreChainingSel);
+
pOLV->SetSelection(pTextChain->GetPreChainingSel(pTextObj));
 break;
 case CursorChainingEvent::TO_NEXT_LINK:
 SdrEndTextEdit();
@@ -552,11 +553,6 @@ void SdrObjEditView::ImpMoveCursorAfterChainingEvent()
 break;
 }
 
-// Default case
-// XXX: You should delete the old ones here too.
-maCursorEvent = NULL;
-maPreChainingSel = NULL;
-
 }
 
 IMPL_LINK(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI)
diff --git a/svx/source/svdraw/textchain.cxx b/svx/source/svdraw/textchain.cxx
index a9b59a9..270712e 100644
--- a/svx/source/svdraw/textchain.cxx
+++ b/svx/source/svdraw/textchain.cxx
@@ -26,6 +26,7 @@
 
 IMPL_CHAIN_PROP_INTERFACE(CursorEvent, CursorChainingEvent)
 IMPL_CHAIN_PROP_INTERFACE(NilChainingEvent, bool)
+IMPL_CHAIN_PROP_INTERFACE(PreChainingSel, ESelection)
 
 /* End Definition of Properties Interface */
 
__

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

[Matthew J . Francis]

 stoc/source/inspect/introspection.cxx |  245 +++---
 1 file changed, 199 insertions(+), 46 deletions(-)

New commits:
commit 61b1697069c50ff72339d4592add42ab72b03243
Author: Matthew J. Francis 
Date:   Mon Jul 6 08:09:24 2015 +0800

Reduce the amount of up front work in performing introspection

Previously, when using PyUNO over a remote bridge, each remote
call which returned an object could result in 50+ further calls
to query interfaces on the result, regardless of whether and
how the object was then used. The majority of these queries
were made under css.script.Invocation to pre-cache certain
information about the returned object.

By making better use of available information to eliminate
interface queries which are certain to fail, and lazily
acquiring those interfaces which are required, remote scripting
is significantly accelerated. In general, this also gives a
small speedup for local scripting.

Change-Id: I4f36da6b5f09cb0d22f21291f05fbea2ae7ae697
Signed-off-by: Stephan Bergmann 

diff --git a/stoc/source/inspect/introspection.cxx 
b/stoc/source/inspect/introspection.cxx
index e6b9110..cfa7085 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -162,6 +162,7 @@ class IntrospectionAccessStatic_Impl: public 
salhelper::SimpleReferenceObject
 {
 friend class Implementation;
 friend class ImplIntrospectionAccess;
+friend class ImplIntrospectionAdapter;
 
 // Holding CoreReflection
 Reference< XIdlReflection > mxCoreReflection;
@@ -194,8 +195,16 @@ class IntrospectionAccessStatic_Impl: public 
salhelper::SimpleReferenceObject
 sal_Int32 mnAttributePropCount;
 sal_Int32 mnMethodPropCount;
 
-// Flag, if a FastPropertySet is supported
+// Flags which indicate if various interfaces are present
 bool mbFastPropSet;
+bool mbPropertySet;
+bool mbElementAccess;
+bool mbNameAccess;
+bool mbNameContainer;
+bool mbIndexAccess;
+bool mbIndexContainer;
+bool mbEnumerationAccess;
+bool mbIdlArray;
 
 // Original-Handles of FastPropertySets
 sal_Int32* mpOrgPropertyHandleArray;
@@ -261,6 +270,15 @@ 
IntrospectionAccessStatic_Impl::IntrospectionAccessStatic_Impl( Reference< XIdlR
 maPropertyConceptSeq.realloc( ARRAY_SIZE_STEP );
 
 mbFastPropSet = false;
+mbPropertySet = false;
+mbElementAccess = false;
+mbNameAccess = false;
+mbNameContainer = false;
+mbIndexAccess = false;
+mbIndexContainer = false;
+mbEnumerationAccess = false;
+mbIdlArray = false;
+
 mpOrgPropertyHandleArray = NULL;
 
 mnPropCount = 0;
@@ -772,6 +790,9 @@ class ImplIntrospectionAdapter :
 // Objekt als Interface
 Reference mxIface;
 
+// Guards the caching of queried interfaces
+osl::Mutex m_aMutex;
+
 // Original-Interfaces des Objekts
 ReferencemxObjElementAccess;
 ReferencemxObjNameContainer;
@@ -781,6 +802,14 @@ class ImplIntrospectionAdapter :
 ReferencemxObjEnumerationAccess;
 ReferencemxObjIdlArray;
 
+Reference getXElementAccess();
+Reference getXNameContainer();
+Reference getXNameAccess();
+Reference getXIndexContainer();
+Reference getXIndexAccess();
+Reference getXEnumerationAccess();
+Reference getXIdlArray();
+
 public:
 ImplIntrospectionAdapter( ImplIntrospectionAccess* pAccess_,
 const Any& obj,
@@ -861,6 +890,112 @@ public:
 throw( IllegalArgumentException, ArrayIndexOutOfBoundsException, 
RuntimeException, std::exception ) SAL_OVERRIDE;
 };
 
+Reference ImplIntrospectionAdapter::getXElementAccess()
+{
+ResettableGuard< Mutex > aGuard( m_aMutex );
+
+if( !mxObjElementAccess.is() )
+{
+aGuard.clear();
+Reference xElementAccess = 
Reference::query( mxIface );
+aGuard.reset();
+if( !mxObjElementAccess.is() )
+mxObjElementAccess = xElementAccess;
+}
+return mxObjElementAccess;
+}
+
+Reference ImplIntrospectionAdapter::getXNameContainer()
+{
+ResettableGuard< Mutex > aGuard( m_aMutex );
+
+if( !mxObjNameContainer.is() )
+{
+aGuard.clear();
+Reference xNameContainer = 
Reference::query( mxIface );
+aGuard.reset();
+if( !mxObjNameContainer.is() )
+mxObjNameContainer = xNameContainer;
+}
+return mxObjNameContainer;
+}
+
+Reference ImplIntrospectionAdapter::getXNameAccess()
+{
+ResettableGuard< Mutex > aGuard( m_aMutex );
+
+if( !mxObjNameAccess.is() )
+{
+aGuard.clear();
+Reference xNameAccess = Reference::query( 
mxIface );
+aGuard.reset();
+if( !mxObjNameAccess.is() )
+mxObjNameAccess = xNameAccess;
+}
+return mxObjNameAccess;
+}
+
+Reference ImplIntrospectionAdapter::getXIndexContainer()
+{
+ResettableGuard< Mutex > aGuard( m_aMutex );
+
+if( !mxObjIndexCont

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

[Miklos Vajna]

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

New commits:
commit b3e645cde951906d883f015d342f85fc0eedb2ec
Author: Miklos Vajna 
Date:   Wed Jul 8 16:36:28 2015 +0200

vcl rendercontext: fix off-by-one error in PaintHelper::PaintBuffer()

With this, Writer no longer has leftover 1-pixel-width/height lines on
scrolling at the right/bottom of the SwEditWin area.

The problem was that PaintBuffer() painted one less row/column of pixels
than intended. This happened because Rectangle::GetSize() uses
GetWidth() and GetHeight(), which return "bound2 - bound1 + 1", but
because the map mode was in twips, the +1 had no effect.

For example, if top=127 and bottom=762 in pixels, then the needed height
is 636, but (assuming e.g. 96 DPI) counting 11430-1905+1 in twips, then
converting to pixels is only 635, so the last row/column is not painted.

Fix the problem by making sure that GetSize() is invoked on a rectangle
that has the size in pixels, that's how e.g.
SdrPreRenderDevice::OutputPreRenderDevice() uses DrawOutDev(), too.

Change-Id: I6f8686e0a91ba402db93982c25be76992c260abe

diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index c8efe72..a47c042 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -182,7 +182,19 @@ void PaintHelper::PaintBuffer()
 m_pWindow->SetMapMode(m_aPaintRectMapMode);
 m_pBuffer->SetMapMode(m_aPaintRectMapMode);
 
-m_pWindow->DrawOutDev(m_aPaintRect.TopLeft(), m_aPaintRect.GetSize(), 
m_aPaintRect.TopLeft(), m_aPaintRect.GetSize(), *m_pBuffer.get());
+// Make sure that the +1 value GetSize() adds to the size is in pixels.
+Size aPaintRectSize;
+if (m_pWindow->GetMapMode().GetMapUnit() == MAP_PIXEL)
+{
+aPaintRectSize = m_aPaintRect.GetSize();
+}
+else
+{
+Rectangle aRectanglePixel = m_pWindow->LogicToPixel(m_aPaintRect);
+aPaintRectSize = 
m_pWindow->PixelToLogic(aRectanglePixel.GetSize());
+}
+
+m_pWindow->DrawOutDev(m_aPaintRect.TopLeft(), aPaintRectSize, 
m_aPaintRect.TopLeft(), aPaintRectSize, *m_pBuffer.get());
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl]

 vcl/opengl/gdiimpl.cxx |   19 +--
 1 file changed, 9 insertions(+), 10 deletions(-)

New commits:
commit d9b7c779a0aed3bacccf5700a0179947db13afa8
Author: Tomaž Vajngerl 
Date:   Tue Jun 30 17:57:14 2015 +0900

opengl: fix fat hairlines - draw hairlines using DrawLineAA

Change-Id: I935bef48fd057e6223dcfc437cbaf242fd61
Reviewed-on: https://gerrit.libreoffice.org/16857
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 351fc1d..e2512b6 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -1348,20 +1348,19 @@ bool OpenGLSalGraphicsImpl::drawPolyLine(
 //bool bDrawnOk = true;
 if( bIsHairline )
 {
-// hairlines can be drawn in a simpler way (the linejoin and linecap 
styles can be ignored)
-basegfx::B2DTrapezoidVector aB2DTrapVector;
-basegfx::tools::createLineTrapezoidFromB2DPolygon( aB2DTrapVector, 
aPolygon, rLineWidth.getX() );
-// draw tesselation result
-if( aB2DTrapVector.size())
+PreDraw();
+if( UseSolidAA( mnLineColor ) )
 {
-PreDraw();
-if( UseSolid( mnLineColor, fTransparency ))
+sal_uInt32 nPoints = rPolygon.count();
+for (sal_uInt32 i = 0; i < nPoints - 1; ++i)
 {
-for( size_t i = 0; i < aB2DTrapVector.size(); ++i )
-DrawTrapezoid( aB2DTrapVector[ i ] );
+const basegfx::B2DPoint& rPt1 = rPolygon.getB2DPoint(i);
+const basegfx::B2DPoint& rPt2 = rPolygon.getB2DPoint(i+1);
+DrawLineAA(rPt1.getX(), rPt1.getY(),
+   rPt2.getX(), rPt2.getY());
 }
-PostDraw();
 }
+PostDraw();
 return true;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Ashod Nakashian]

 svx/source/dialog/fntctrl.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit c3c6bf235af32781e83d4fed2867a16bfeafa659
Author: Ashod Nakashian 
Date:   Wed Jul 8 08:37:23 2015 -0400

Limit the font preview text length.

When text is selected, the preview text is the first TEXT_WIDTH (80)
characters of the selection rounded up to the next word.

However when no word boundary is found, the preview text is as long
as the selection, which causes the preview to be less than usable
in some extreme cases.

This patch is to limit the preview text length when no word boundary
is found, thereby always resulting in predictable behavior.

Change-Id: I8a21638d601714db956b9b160664dfe1e5e49a4a
Reviewed-on: https://gerrit.libreoffice.org/16855
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 2767bb7..2fce458 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -712,9 +712,11 @@ void SvxFontPrevWindow::Paint(vcl::RenderContext& 
rRenderContext, const Rectangl
 
 if (pImpl->maText.getLength() > (TEXT_WIDTH - 1))
 {
-sal_Int32 nSpaceIdx = pImpl->maText.indexOf(" ", TEXT_WIDTH);
+const sal_Int32 nSpaceIdx = pImpl->maText.indexOf(" ", 
TEXT_WIDTH);
 if (nSpaceIdx != -1)
 pImpl->maText = pImpl->maText.copy(0, nSpaceIdx);
+else
+pImpl->maText = pImpl->maText.copy(0, (TEXT_WIDTH - 1));
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source

[matteocam]

 svx/source/svdraw/svdedxv.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 777fb6d2791b63daaf0a74ebe9157af7881c5079
Author: matteocam 
Date:   Wed Jul 8 10:31:41 2015 -0400

Change asserts to test+return for cursor pos

Change-Id: Ief817c654ea5ac2b1cbc3ab535e9478dcb242724

diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 04bf0df..3ca380d 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -529,8 +529,8 @@ void SdrObjEditView::ImpMoveCursorAfterChainingEvent()
 if (!pTextObj->IsChainable() || !pTextObj->GetNextLinkInChain())
 return;
 
-assert(maCursorEvent);
-assert(maPreChainingSel);
+if(!maCursorEvent || !maPreChainingSel)
+return;
 
 SdrTextObj *pNextLink = pTextObj->GetNextLinkInChain();
 OutlinerView* pOLV = GetTextEditOutlinerView();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - include/svx svx/source

[matteocam]

 include/svx/textchain.hxx   |   88 
 svx/source/svdraw/svdedxv.cxx   |   14 -
 svx/source/svdraw/textchain.cxx |   39 ---
 svx/source/svdraw/textchainflow.cxx |2 
 4 files changed, 89 insertions(+), 54 deletions(-)

New commits:
commit 4c9e5c5862d1aed26f96228c2fe01ebf0de8fd01
Author: matteocam 
Date:   Wed Jul 8 10:29:51 2015 -0400

Define macro system for text chain properties

Change-Id: Id50a9996e0b60e0650dbd67fdb4ebbc8ef2f1d4a

diff --git a/include/svx/textchain.hxx b/include/svx/textchain.hxx
index 730489b..efd52ef 100644
--- a/include/svx/textchain.hxx
+++ b/include/svx/textchain.hxx
@@ -20,6 +20,52 @@
 #ifndef INCLUDED_SVX_TEXTCHAIN_HXX
 #define INCLUDED_SVX_TEXTCHAIN_HXX
 
+/*
+ * Properties can be accessed and set from a TextChain with:
+ * - T TextChain::GetPROPNAME(SdrTextObj *)
+ * - void TextChain::SetPROPNAME(SdrTextObj *, T)
+ * where T and PROPNAME are respectively type and name of a property.
+ *
+ * To add a property PROPNAME of type T (and its interface) in TextChain:
+ * 1) Add
+ *  "DECL_CHAIN_PROP(PROPNAME, T)"
+ *in class ImpChainLinkProperties;
+ * 2) Add
+ *  "INIT_CHAIN_PROP(PROPNAME, V)"
+ *in constructor of ImpChainLinkProperties below
+ *(V is the initialization value for PROPNAME)
+ *
+ * 2) Add
+ *  "DECL_CHAIN_PROP_INTERFACE(PROPNAME, T)"
+ *in class TextChain (under "public:");
+ * 3)  Add
+ *   "IMPL_CHAIN_PROP_INTERFACE(PROPNAME, T)"
+ *in file "svx/source/svdraw/textchain.cxx"
+*/
+
+#define DECL_CHAIN_PROP(PropName, PropType) \
+PropType a##PropName;
+
+#define INIT_CHAIN_PROP(PropName, PropDefault) \
+a##PropName = (PropDefault);
+
+#define DECL_CHAIN_PROP_INTERFACE(PropName, PropType) \
+PropType Get##PropName (SdrTextObj *); \
+void Set##PropName (SdrTextObj *, PropType);
+
+#define IMPL_CHAIN_PROP_INTERFACE(PropName, PropType) \
+PropType TextChain::Get##PropName (SdrTextObj *pTarget) { \
+ImpChainLinkProperties *pLinkProperties = GetLinkProperties(pTarget); \
+return pLinkProperties->a##PropName; \
+} \
+void TextChain::Set##PropName (SdrTextObj *pTarget, PropType aPropParam) \
+{ \
+ImpChainLinkProperties *pLinkProperties = GetLinkProperties(pTarget); \
+pLinkProperties->a##PropName = aPropParam; \
+}
+
+/* End Special Properties Macro */
+
 #include 
 
 class ImpChainLinkProperties;
@@ -39,16 +85,40 @@ enum class CursorChainingEvent
 UNCHANGED
 };
 
+/*
+ * // Note Sure I need the code here
+struct CursorChainingInfo
+{
+public:
+CursorChainingEvent GetEvent() const;
+ESelection GetPreChainingSel() const;
+ESelection GetPostChainingSel() const;
+
+void SetEvent(CursorChainingEvent aEvent) { maEvent = aEvent; }
+void SetPreChainingSel(ESelection aSel) { maPreChainingSel = aSel; }
+void SetPostChainingSel(ESelection aSel) { maPostChaingingSel = aSel; }
+private:
+CursorChainingEvent maEvent;
+ESelection maPreChainingSel;
+ESelection maPostChainingSel;
+};
+* */
+
 class ImpChainLinkProperties
 {
 protected:
 friend class TextChain;
 
-ImpChainLinkProperties();
+ImpChainLinkProperties() {
+INIT_CHAIN_PROP(NilChainingEvent, false)
+INIT_CHAIN_PROP(CursorEvent, CursorChainingEvent::UNCHANGED)
+}
 
+private:
 // NOTE: Remember to set default value in contructor when adding field
-bool bNilChainingEvent;
-CursorChainingEvent aCursorEvent; // XXX: replace with enum instead of 
bool?
+DECL_CHAIN_PROP(NilChainingEvent, bool)
+DECL_CHAIN_PROP(CursorEvent, CursorChainingEvent)
+
 };
 
 
@@ -62,18 +132,18 @@ class TextChain {
 bool IsLinkInChain(SdrTextObj *) const;
 SdrTextObj *GetNextLink(SdrTextObj *) const;
 
-CursorChainingEvent GetCursorEvent(SdrTextObj *);
-void SetCursorEvent(SdrTextObj *, CursorChainingEvent);
-
 ChainLinkId GetId(SdrTextObj *) const;
 ImpChainLinkProperties *GetLinkProperties(SdrTextObj *);
 
+// Specific Link Properties
+DECL_CHAIN_PROP_INTERFACE(CursorEvent, CursorChainingEvent)
+DECL_CHAIN_PROP_INTERFACE(NilChainingEvent, bool)
+
+
+
 // return whether a paragraph is split between the two links in the 
argument
 bool GetLinksHaveMergeableFirstPara(SdrTextObj *, SdrTextObj *);
 
-bool GetNilChainingEvent(SdrTextObj *pTarget);
-void SetNilChainingEvent(SdrTextObj *, bool);
-
 protected:
 LinkPropertiesMap maLinkPropertiesMap;
 };
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index c09dfb1..04bf0df 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -505,23 +505,9 @@ IMPL_LINK_NOARG(SdrObjEditView,ImpChainingEventHdl)
 // trigger actual chaining
 pTextObj->onChainingEvent();
 
-// XXX: this logic could be put in a separate approppriate class
-/* Cursor motion

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - dtrans/source officecfg/registry sot/inc sot/source starmath/inc starmath/sdi starmath/source starmath/uiconfig

[Regina Henschel]

 dtrans/source/win32/ftransl/ftransl.cxx   |2 
 officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu |5 
 sot/inc/sot/formats.hxx   |3 
 sot/source/base/exchange.cxx  |1 
 starmath/inc/starmath.hrc |1 
 starmath/sdi/smath.sdi|   25 +++
 starmath/sdi/smslots.sdi  |6 
 starmath/source/view.cxx  |   74 
++
 starmath/uiconfig/smath/menubar/menubar.xml   |1 
 9 files changed, 117 insertions(+), 1 deletion(-)

New commits:
commit 9ec2148653436be8612273439180749e71e2ce58
Author: Regina Henschel 
Date:   Wed Jul 8 12:31:43 2015 +

#i107734 Support for Math Input Panel in Windows 7

The patch introduces a new command .uno:ImportMathClipboard to module Math.
It imports MathML content from clipboard and transforms it to Starmath
It handles clipboard MIME type 'application/mathml+xml' and
plain text, which can be interpreted as MathML segment.
It partly solves issues #i14252, #i34781, and #i53509 too.
Review by: Hanya 

diff --git a/dtrans/source/win32/ftransl/ftransl.cxx 
b/dtrans/source/win32/ftransl/ftransl.cxx
index cfceddc1..eedbc00 100644
--- a/dtrans/source/win32/ftransl/ftransl.cxx
+++ b/dtrans/source/win32/ftransl/ftransl.cxx
@@ -516,6 +516,8 @@ void SAL_CALL CDataFormatTranslator::initTranslationTable()
 m_TranslTable.push_back(FormatEntry("image/bmp", "Windows Bitmap", NULL, 
CF_INVALID, CPPUTYPE_DEFAULT));
 //SOT_FORMATSTR_ID_PNG
 m_TranslTable.push_back(FormatEntry("image/png", "PNG", NULL, CF_INVALID, 
CPPUTYPE_DEFAULT));
+//SOT_FORMATSTR_ID_MATHML
+m_TranslTable.push_back(FormatEntry("application/mathml+xml", "MathML", 
NULL, CF_INVALID, CPPUTYPE_DEFAULT));
 //SOT_FORMATSTR_ID_DUMMY3
 
m_TranslTable.push_back(FormatEntry("application/x-openoffice-dummy3;windows_formatname=\"SO_DUMMYFORMAT_3\"",
 "SO_DUMMYFORMAT_3", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
 //SOT_FORMATSTR_ID_DUMMY4
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu
index c266fbf..babc106 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu
@@ -77,6 +77,11 @@
 ~Import Formula...
 
 
+
+
+Import MathML from 
Clipboard
+
+
 
 
 Insert Command
diff --git a/sot/inc/sot/formats.hxx b/sot/inc/sot/formats.hxx
index 24bdd44..6c30d18 100644
--- a/sot/inc/sot/formats.hxx
+++ b/sot/inc/sot/formats.hxx
@@ -182,7 +182,8 @@
 #define SOT_FORMATSTR_ID_STARBASE_8 ((sal_uLong)139)
 #define SOT_FORMATSTR_ID_HC_GDIMETAFILE ((sal_uLong)140)
 #define SOT_FORMATSTR_ID_PNG((sal_uLong)141)
-#define SOT_FORMATSTR_ID_USER_END   SOT_FORMATSTR_ID_PNG
+#define SOT_FORMATSTR_ID_MATHML ((sal_uLong)142)
+#define SOT_FORMATSTR_ID_USER_END   SOT_FORMATSTR_ID_MATHML
 
 #endif // _SOT_FORMATS_HXX
 
diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx
index c576eb2..4b824e6 100644
--- a/sot/source/base/exchange.cxx
+++ b/sot/source/base/exchange.cxx
@@ -208,6 +208,7 @@ namespace
 /*139 SOT_FORMATSTR_ID_STARBASE_8*/{ 
MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII, "StarBase 8", &::getCppuType( 
(const Sequence< sal_Int8 >*) 0 ) },
 /*140 SOT_FORMAT_GDIMETAFILE*/  { 
"application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"",
 "High Contrast GDIMetaFile", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) 
},
 /*141 SOT_FORMATSTR_ID_PNG*/{ "image/png", 
"PNG Bitmap", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/*142 SOT_FORMATSTR_ID_MATHML*/ { 
"application/mathml+xml", "MathML", &::getCppuType( (const Sequence< sal_Int8 
>*) 0 ) },
 };
 return &aInstance[0];
 }
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index c1855d8..d273a7d 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -52,6 +52,7 @@
 #define SID_SYMBOLS (SID_SMA_START + 56) // Muss erstmal 
wieder aufgenommen werden !
 #define SID_TEXTMODE(SID_SMA_START + 57)
 #define SID_IMPORT_FORMULA  (SID_SMA_START + 58)
+#define SID_IMPORT_MATHML_CLIPBOARD (SID_SMA_START + 59)
 #define SID_TEXT(SID_SMA_START + 100)
 #define SID_GAPHIC_SM   (SID_SMA_START + 101)
 #define SID_FITINWINDOW 

[Libreoffice-commits] core.git: Branch 'private/jmux/kde4-vcl-5-0-fix' - 122 commits - accessibility/inc basegfx/qa basegfx/source basic/source bean/com canvas/source chart2/source compilerplugins/cla

[Jan-Marek Glogowski]

Rebased ref, commits from common ancestor:
commit dfe72b7c885e1e4db7cf90e05c8605716401ffd2
Author: Jan-Marek Glogowski 
Date:   Wed Jul 8 13:41:54 2015 +

tdf#92115 KDE4 workaround combo boxes

Actually most combo boxes seem to be list boxes.

Once I understand the correct subControl drawing, the button will be
replaced. So this uses LO drop down drawing...

Change-Id: I76c0c62b35158b20f5aabed1d97907063a99ccc7

diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index a843269..cc320ae 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -100,7 +100,6 @@ bool KDESalGraphics::IsNativeControlSupported( ControlType 
type, ControlPart par
 case CTRL_EDITBOX:
 case CTRL_COMBOBOX:
 case CTRL_TOOLBAR:
-case CTRL_LISTBOX:
 case CTRL_FRAME:
 case CTRL_SCROLLBAR:
 case CTRL_WINDOW_BACKGROUND:
@@ -108,6 +107,10 @@ bool KDESalGraphics::IsNativeControlSupported( ControlType 
type, ControlPart par
 case CTRL_FIXEDLINE:
 return true;
 
+case CTRL_LISTBOX:
+return (part == PART_ENTIRE_CONTROL
+ || part == PART_SUB_EDIT);
+
 case CTRL_SPINBOX:
 return (part == PART_ENTIRE_CONTROL || part == 
HAS_BACKGROUND_TEXTURE);
 
@@ -643,6 +646,12 @@ bool KDESalGraphics::getNativeControlRegion( ControlType 
type, ControlPart part,
  const OUString&,
  Rectangle &nativeBoundingRegion, 
Rectangle &nativeContentRegion )
 {
+bool nativeSupport = IsNativeControlSupported( type, part );
+if( ! nativeSupport ) {
+assert( ! nativeSupport && "drawNativeControl called without native 
support!" );
+return false;
+}
+
 bool retVal = false;
 
 QRect boundingRect = region2QRect( controlRegion );
@@ -724,8 +733,6 @@ bool KDESalGraphics::getNativeControlRegion( ControlType 
type, ControlPart part,
 {
 case PART_ENTIRE_CONTROL:
 {
-int size = 
QApplication::style()->pixelMetric(QStyle::PM_ComboBoxFrameWidth) - 2;
-
 // find out the minimum size that should be used
 // assume contents is a text ling
 int nHeight = QApplication::fontMetrics().height();
@@ -738,8 +745,10 @@ bool KDESalGraphics::getNativeControlRegion( ControlType 
type, ControlPart part,
 // FIXME: why this difference between comboboxes and 
listboxes ?
 // because a combobox has a sub edit and that is positioned
 // inside the outer bordered control ?
-if( type == CTRL_COMBOBOX )
+if( type == CTRL_COMBOBOX ) {
+int size = 
QApplication::style()->pixelMetric(QStyle::PM_ComboBoxFrameWidth) - 2;
 contentRect.adjust(-size,-size,size,size);
+}
 retVal = true;
 break;
 }
commit 7b3bb98517fdf626b31765fb7c925e63a6687327
Author: Jan-Marek Glogowski 
Date:   Wed Jul 8 07:51:57 2015 +

KDE4: cleanup IsNativeControlSupported

Be (more) correct about the widgets and parts, we actually can draw
natively in KDE4.

Also add an assert, so drawNativeControl won't be called with values
not supported by IsNativeControlSupported.

Fixes tdf#92110
Fixes tdf#91808

Change-Id: Iac6c78194191a9cd059ace560c285263ce7c1045

diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index 1fa06fd..a843269 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -85,47 +85,38 @@ KDESalGraphics::~KDESalGraphics()
 
 bool KDESalGraphics::IsNativeControlSupported( ControlType type, ControlPart 
part )
 {
-if (type == CTRL_PUSHBUTTON) return true;
-
-if (type == CTRL_MENUBAR) return true;
-
-if (type == CTRL_MENU_POPUP) return true;
-
-if (type == CTRL_EDITBOX) return true;
-
-if (type == CTRL_COMBOBOX) return true;
-
-if (type == CTRL_TOOLBAR) return true;
-
-if (type == CTRL_CHECKBOX) return true;
-
-if (type == CTRL_LISTBOX) return true;
-
-if (type == CTRL_LISTNODE) return true;
-
-if (type == CTRL_FRAME) return true;
-
-if (type == CTRL_SCROLLBAR) return true;
-
-if (type == CTRL_WINDOW_BACKGROUND) return true;
-
-if (type == CTRL_SPINBOX && (part == PART_ENTIRE_CONTROL || part == 
HAS_BACKGROUND_TEXTURE) ) return true;
-
-// no spinbuttons for KDE, paint spinbox complete
-//if (type == CTRL_SPINBUTTONS) return true;
-
-if (type == CTRL_GROUPBOX) return true;
-
-if (type == CTRL_FIXEDLINE) return true;
+switch (type)
+{
+case CTRL_PUSHBUTTON:
+case CTRL_RADIOBUTTON:
+case CTRL_CHECKBOX:
+case CTRL_TOOLTIP:
+case CTRL_

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

[Bjoern Michaelsen]

 sw/source/ui/dbui/mailmergewizard.cxx  |1 
 sw/source/uibase/dbui/mmconfigitem.cxx |   70 +++--
 sw/source/uibase/inc/mmconfigitem.hxx  |6 +-
 3 files changed, 30 insertions(+), 47 deletions(-)

New commits:
commit d623e7e6cba3090dcb5d21174cd5ed42bb069163
Author: Bjoern Michaelsen 
Date:   Sat Jul 4 23:22:53 2015 +0200

tdf#90377: fix exclude recipient in mail merge

- first, actually use the selection in MergeNew()
- secoond, bring back GetSelection() for that
- third, throw away lots of the old (dead) code that mostly just
  stumbled over itself
  - e.g. ExcludeRecord() wouldnt work on the last element due to a
off-by-one error

Change-Id: I07d07e086b748b393f2ada7cb22fdb2ce285ad65
Reviewed-on: https://gerrit.libreoffice.org/16762
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 
Reviewed-on: https://gerrit.libreoffice.org/16853
Reviewed-by: Björn Michaelsen 
Tested-by: Miklos Vajna 

diff --git a/sw/source/ui/dbui/mailmergewizard.cxx 
b/sw/source/ui/dbui/mailmergewizard.cxx
index ced4c6e..4889be0 100644
--- a/sw/source/ui/dbui/mailmergewizard.cxx
+++ b/sw/source/ui/dbui/mailmergewizard.cxx
@@ -276,6 +276,7 @@ void SwMailMergeWizard::CreateTargetDocument()
 aDescriptor[ svx::daCursor ]  <<= m_rConfigItem.GetResultSet();
 aDescriptor[ svx::daCommand ] <<= 
m_rConfigItem.GetCurrentDBData().sCommand;
 aDescriptor[ svx::daCommandType ] <<= 
m_rConfigItem.GetCurrentDBData().nCommandType;
+aDescriptor[ svx::daSelection ]   <<= m_rConfigItem.GetSelection();
 
 SwMergeDescriptor aMergeDesc( DBMGR_MERGE_SHELL, 
GetSwView()->GetWrtShell(),
 aDescriptor);
diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx 
b/sw/source/uibase/dbui/mmconfigitem.cxx
index 341fcd8..2a36db3 100644
--- a/sw/source/uibase/dbui/mmconfigitem.cxx
+++ b/sw/source/uibase/dbui/mmconfigitem.cxx
@@ -17,7 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -34,6 +36,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1020,57 +1023,34 @@ sal_Int32 SwMailMergeConfigItem::GetResultSetPosition() 
const
 return m_pImpl->nResultSetCursorPos;
 }
 
-bool SwMailMergeConfigItem::IsRecordExcluded(sal_Int32 nRecord)
-{
-bool bRet = false;
-if(nRecord > 0 && nRecord < m_aSelection.getLength())
-{
-sal_Int32 nTemp = 0;
-m_aSelection[nRecord - 1] >>= nTemp;
-bRet = nTemp < 1;
-}
-return bRet;
-}
+bool SwMailMergeConfigItem::IsRecordExcluded(sal_Int32 nRecord) const
+{ return m_aExcludedRecords.find(nRecord) != m_aExcludedRecords.end(); }
 
 void SwMailMergeConfigItem::ExcludeRecord(sal_Int32 nRecord, bool bExclude)
 {
-//nRecord is based on 1
-//the selection array contains Anys for all records
-//excluded records  contain a '-1'
-if(!m_aSelection.getLength() || nRecord > m_aSelection.getLength())
-{
-if(bExclude)
-{
-//if no selection array is available we need to create one 
containing the
-//entries for all available records
-if(!m_pImpl->xResultSet.is())
-GetResultSet();
-if(m_pImpl->xResultSet.is())
-{
-m_pImpl->xResultSet->last();
-sal_Int32 nEnd = m_pImpl->xResultSet->getRow();
-sal_Int32 nStart = m_aSelection.getLength();
-m_aSelection.realloc(nEnd);
-Any* pSelection = m_aSelection.getArray();
-for(sal_Int32 nIndex = nStart; nIndex < nEnd; ++nIndex)
-{
-if((nRecord - 1) != nIndex)
-pSelection[nIndex] <<= nIndex + 1;
-else
-pSelection[nIndex] <<= (sal_Int32) -1;
-}
-}
-}
-}
+if(bExclude)
+m_aExcludedRecords.insert(nRecord);
 else
-{
-if(nRecord > 0 && m_aSelection.getLength() > nRecord)
-{
-m_aSelection[nRecord - 1] <<= bExclude ? -1 : nRecord;
-}
-}
+m_aExcludedRecords.erase(nRecord);
 }
 
+uno::Sequence SwMailMergeConfigItem::GetSelection() const
+{
+if(!m_pImpl->xResultSet.is())
+GetResultSet();
+if(!m_pImpl->xResultSet.is())
+return {};
+m_pImpl->xResultSet->last();
+sal_Int32 nResultSetSize = m_pImpl->xResultSet->getRow()+1;
+std::vector vResult;
+vResult.reserve(nResultSetSize);
+for(sal_Int32 nIdx=1; nIdx(nIdx));
+return comphelper::containerToSequence(vResult);
+}
+
+
 const uno::Sequence< OUString>&
 SwMailMergeConfigItem::GetSavedDocuments() const
 {
diff --git a/sw/source/uibase/inc/mmconfigitem.hxx 
b/sw/source/uibase/inc/mmconfigitem.hxx
index 8117cfd..82ddcd4 100644
--- a/sw/source/uibase/inc/mmconfigitem.hxx
+++ b/sw/source/uibase/inc/mmconfigitem.hxx
@

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

[Michael Meeks]

 sd/source/ui/framework/factories/FullScreenPane.cxx |7 +++
 sd/source/ui/presenter/PresenterHelper.cxx  |6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 7079f691a31ca380610b3c77a2faa0bcf0b3
Author: Michael Meeks 
Date:   Tue Jul 7 22:35:46 2015 +0100

tdf#91574 - fix slideshow presenter console lifecycle.

Change-Id: I9748579fed8fd4dcf505bc79e48e40c1255bd22e
Reviewed-on: https://gerrit.libreoffice.org/16836
Reviewed-by: David Ostrovsky 
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx 
b/sd/source/ui/framework/factories/FullScreenPane.cxx
index 746be66..b1540bc 100644
--- a/sd/source/ui/framework/factories/FullScreenPane.cxx
+++ b/sd/source/ui/framework/factories/FullScreenPane.cxx
@@ -42,8 +42,7 @@ FullScreenPane::FullScreenPane (
 const Reference& rxPaneId,
 const vcl::Window* pViewShellWindow)
 : FrameWindowPane(rxPaneId,NULL),
-  mxComponentContext(rxComponentContext),
-  mpWorkWindow(NULL)
+  mxComponentContext(rxComponentContext)
 {
 vcl::Window* pParent = NULL;
 mpWorkWindow.reset(VclPtr::Create(
@@ -110,7 +109,7 @@ void SAL_CALL FullScreenPane::disposing()
 {
 Link<> aWindowEventHandler (LINK(this, FullScreenPane, 
WindowEventHandler));
 mpWorkWindow->RemoveEventListener(aWindowEventHandler);
-mpWorkWindow.reset();
+mpWorkWindow.disposeAndClear();
 }
 
 FrameWindowPane::disposing();
@@ -186,7 +185,7 @@ IMPL_LINK(FullScreenPane, WindowEventHandler, 
VclWindowEvent*, pEvent)
 break;
 
 case VCLEVENT_OBJECT_DYING:
-mpWorkWindow.reset();
+mpWorkWindow.disposeAndClear();
 break;
 }
 return 1;
diff --git a/sd/source/ui/presenter/PresenterHelper.cxx 
b/sd/source/ui/presenter/PresenterHelper.cxx
index 60b7bcb..8b99c0b 100644
--- a/sd/source/ui/presenter/PresenterHelper.cxx
+++ b/sd/source/ui/presenter/PresenterHelper.cxx
@@ -73,10 +73,10 @@ Reference SAL_CALL 
PresenterHelper::createWindow (
 sal_Bool bEnableParentClip)
 throw (css::uno::RuntimeException, std::exception)
 {
-vcl::Window* pParentWindow = VCLUnoHelper::GetWindow(rxParentWindow);
+VclPtr pParentWindow(VCLUnoHelper::GetWindow(rxParentWindow));
 
 // Create a new window.
-vcl::Window* pWindow = NULL;
+VclPtr pWindow;
 if (bCreateSystemChildWindow)
 {
 pWindow = VclPtr::Create(pParentWindow, 
WB_SYSTEMCHILDWINDOW);
@@ -91,7 +91,7 @@ Reference SAL_CALL 
PresenterHelper::createWindow (
 {
 // Make the frame window transparent and make the parent able to
 // draw behind it.
-if (pParentWindow != NULL)
+if (pParentWindow.get() != NULL)
 pParentWindow->EnableChildTransparentMode(true);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 9 commits - cui/source sc/source sd/qa sd/source

[Caolán McNamara]

 cui/source/options/optaboutconfig.cxx   |1 
 sc/source/ui/vba/excelvbahelper.cxx |2 -
 sc/source/ui/vba/excelvbahelper.hxx |2 -
 sc/source/ui/vba/vbaapplication.cxx |2 -
 sc/source/ui/vba/vbaeventshelper.cxx|4 +--
 sc/source/ui/vba/vbaeventshelper.hxx|4 +--
 sc/source/ui/vba/vbarange.cxx   |4 +--
 sc/source/ui/vba/vbarange.hxx   |2 -
 sd/qa/unit/data/odp/pass/test-slide-name-fields.odp |binary
 sd/source/ui/unoidl/unomodel.cxx|   26 ++--
 10 files changed, 35 insertions(+), 12 deletions(-)

New commits:
commit 6793eaa4fa77292b23e9b86221e598f438d45b8e
Author: Caolán McNamara 
Date:   Wed Jul 8 14:23:55 2015 +0100

coverity#1311335 Uncaught exception

Change-Id: Idd654a49457c89598e45e0eb17336297b6745703

diff --git a/sc/source/ui/vba/vbaapplication.cxx 
b/sc/source/ui/vba/vbaapplication.cxx
index f1cf9fc..2135014 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -1066,7 +1066,7 @@ void lclIntersectRanges( ListOfScRange& rList, const 
uno::Any& rArg )
 uno::Reference< excel::XRange > lclCreateVbaRange(
 const uno::Reference< uno::XComponentContext >& rxContext,
 const uno::Reference< frame::XModel >& rxModel,
-const ListOfScRange& rList ) throw (uno::RuntimeException)
+const ListOfScRange& rList ) throw (uno::RuntimeException, 
std::exception)
 {
 ScDocShell* pDocShell = excel::getDocShell( rxModel );
 if( !pDocShell ) throw uno::RuntimeException();
commit 1e40c6459fd0dd64cd27c7b2ffc093045cdbe78d
Author: Caolán McNamara 
Date:   Wed Jul 8 14:23:26 2015 +0100

coverity#1311334 Uncaught exception

Change-Id: I70c8fb0a30eb8185a5fe326d0ce11fcac7aa7e4f

diff --git a/sc/source/ui/vba/vbaeventshelper.cxx 
b/sc/source/ui/vba/vbaeventshelper.cxx
index ea428c1..e471839 100644
--- a/sc/source/ui/vba/vbaeventshelper.cxx
+++ b/sc/source/ui/vba/vbaeventshelper.cxx
@@ -858,7 +858,7 @@ uno::Any ScVbaEventsHelper::createWorksheet( const 
uno::Sequence< uno::Any >& rA
 }
 
 uno::Any ScVbaEventsHelper::createRange( const uno::Sequence< uno::Any >& 
rArgs, sal_Int32 nIndex ) const
-throw (lang::IllegalArgumentException, uno::RuntimeException)
+throw (lang::IllegalArgumentException, uno::RuntimeException, 
std::exception)
 {
 // it is possible to pass an existing VBA Range object
 uno::Reference< excel::XRange > xVbaRange = getXSomethingFromArgs< 
excel::XRange >( rArgs, nIndex );
diff --git a/sc/source/ui/vba/vbaeventshelper.hxx 
b/sc/source/ui/vba/vbaeventshelper.hxx
index e9020b0..7a86674 100644
--- a/sc/source/ui/vba/vbaeventshelper.hxx
+++ b/sc/source/ui/vba/vbaeventshelper.hxx
@@ -57,7 +57,7 @@ private:
 /** Creates a VBA Worksheet object (the argument must contain a sheet 
index). */
 css::uno::Any createWorksheet( const css::uno::Sequence< css::uno::Any >& 
rArgs, sal_Int32 nIndex ) const throw (css::lang::IllegalArgumentException, 
css::uno::RuntimeException, std::exception);
 /** Creates a VBA Range object (the argument must contain a UNO range or 
UNO range list). */
-css::uno::Any createRange( const css::uno::Sequence< css::uno::Any >& 
rArgs, sal_Int32 nIndex ) const throw (css::lang::IllegalArgumentException, 
css::uno::RuntimeException);
+css::uno::Any createRange( const css::uno::Sequence< css::uno::Any >& 
rArgs, sal_Int32 nIndex ) const throw (css::lang::IllegalArgumentException, 
css::uno::RuntimeException, std::exception);
 /** Creates a VBA Hyperlink object (the argument must contain a UNO cell). 
*/
 css::uno::Any createHyperlink( const css::uno::Sequence< css::uno::Any >& 
rArgs, sal_Int32 nIndex ) const throw (css::lang::IllegalArgumentException, 
css::uno::RuntimeException, std::exception);
 /** Creates a VBA Window object (the argument must contain a model 
controller). */
commit 856583492785d3c332f5ad4092a8196d590f930b
Author: Caolán McNamara 
Date:   Wed Jul 8 14:22:29 2015 +0100

coverity#1311333 Uncaught exception

Change-Id: I692712d7a5a84efdec383c5d1ec7bd492a2e1aca

diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index ef83fae..dc5b1f2 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -1235,7 +1235,7 @@ bool getScRangeListForAddress( const OUString& sName, 
ScDocShell* pDocSh, ScRang
 }
 
 ScVbaRange*
-getRangeForName( const uno::Reference< uno::XComponentContext >& xContext, 
const OUString& sName, ScDocShell* pDocSh, table::CellRangeAddress& pAddr, 
formula::FormulaGrammar::AddressConvention eConv = 
formula::FormulaGrammar::CONV_XL_A1 ) throw ( uno::RuntimeException )
+getRangeForName( const uno::Reference< uno::XComponentContext >& xContext, 
const OUString& sName, ScDocShell* pDocSh, table::CellRangeAddress& pAddr, 
formula::FormulaGrammar::AddressConvention eCon

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source include/editeng svx/source

[matteocam]

 editeng/source/outliner/overflowingtxt.cxx |   57 -
 include/editeng/overflowingtxt.hxx |7 +++
 svx/source/svdraw/textchainflow.cxx|5 +-
 3 files changed, 50 insertions(+), 19 deletions(-)

New commits:
commit abf19ac0252a7f21bb276ed98ee73312096eaf93
Author: matteocam 
Date:   Wed Jul 8 09:31:28 2015 -0400

Save insertion point in dest box when making overflowing text

Change-Id: If08717c89d424b3e248d628e289f00da2d340d94

diff --git a/editeng/source/outliner/overflowingtxt.cxx 
b/editeng/source/outliner/overflowingtxt.cxx
index 49284f6..77f4829 100644
--- a/editeng/source/outliner/overflowingtxt.cxx
+++ b/editeng/source/outliner/overflowingtxt.cxx
@@ -31,23 +31,8 @@ OutlinerParaObject 
*NonOverflowingText::ToParaObject(Outliner *pOutliner) const
 return pPObj;
 }
 
-/*
-OUString OverflowingText::GetEndingLines() const
-{
-// If the only overflowing part is some lines in a paragraph,
-// the end of the overflowing text is its head.
-if (!HasOtherParas())
-return mHeadTxt;
-
-return mTailTxt;
-}
-
-OUString OverflowingText::GetHeadingLines() const
-{
-return mHeadTxt;
-}
-* */
-
+// The equivalent of ToParaObject for OverflowingText. Here we are prepending 
the overflowing text to the old dest box's text
+// XXX: In a sense a better name for OverflowingText and NonOverflowingText 
are respectively DestLinkText and SourceLinkText
 OutlinerParaObject *OverflowingText::GetJuxtaposedParaObject(Outliner *pOutl, 
OutlinerParaObject *pNextPObj)
 {
 if (mpContentTextObj == NULL) {
@@ -59,14 +44,52 @@ OutlinerParaObject 
*OverflowingText::GetJuxtaposedParaObject(Outliner *pOutl, Ou
 OutlinerParaObject *pOverflowingPObj = new 
OutlinerParaObject(*mpContentTextObj);
 // the OutlinerParaObject constr. at the prev line gives no valid outliner 
mode, so we set it
 pOverflowingPObj->SetOutlinerMode(pOutl->GetOutlinerMode());
+
+/* Actual Text Setting */
 pOutl->SetText(*pOverflowingPObj);
+
+// Set selection position between new and old text
+maInsertionPointSel = impGetEndSelection(pOutl);
+
 pOutl->AddText(*pNextPObj);
 
+// End Text Setting
+
 OutlinerParaObject *pPObj = pOutl->CreateParaObject();
 //pPObj->SetOutlinerMode(pOutl->GetOutlinerMode());
 return pPObj;
 }
 
+ESelection OverflowingText::impGetEndSelection(Outliner *pOutl) const
+{
+const sal_Int32 nParaCount = pOutl->GetParagraphCount();
+const sal_Int32 nLastParaIndex = nParaCount > 1 ? nParaCount - 1 : 0;
+Paragraph* pLastPara = pOutl->GetParagraph( nLastParaIndex);
+const sal_Int32 nLenLastPara = pOutl->GetText(pLastPara).getLength();
+// Selection at end of editing area
+ESelection 
aEndSel(nLastParaIndex,nLenLastPara,nLastParaIndex,nLenLastPara);
+return aEndSel;
+}
+
+/*
+OUString OverflowingText::GetEndingLines() const
+{
+// If the only overflowing part is some lines in a paragraph,
+// the end of the overflowing text is its head.
+if (!HasOtherParas())
+return mHeadTxt;
+
+return mTailTxt;
+}
+
+OUString OverflowingText::GetHeadingLines() const
+{
+return mHeadTxt;
+}
+* */
+
+
+
 
 OFlowChainedText::OFlowChainedText(Outliner *pOutl)
 {
diff --git a/include/editeng/overflowingtxt.hxx 
b/include/editeng/overflowingtxt.hxx
index 797264b..be5530b 100644
--- a/include/editeng/overflowingtxt.hxx
+++ b/include/editeng/overflowingtxt.hxx
@@ -22,6 +22,7 @@
 
 #include 
 #include 
+#include 
 
 class OUString;
 
@@ -39,9 +40,12 @@ public:
 
 OverflowingText(EditTextObject *pTObj) : mpContentTextObj(pTObj)
 {
+ESelection aStartPos(0,0,0,0);
+maInsertionPointSel = aStartPos;
 }
 
 OutlinerParaObject *GetJuxtaposedParaObject(Outliner *, 
OutlinerParaObject *);
+ESelection GetInsertionPointSel() const;
 
 //OUString GetHeadingLines() const;
 //OUString GetEndingLines() const;
@@ -49,6 +53,9 @@ public:
 
 private:
 const EditTextObject *mpContentTextObj;
+ESelection maInsertionPointSel;
+
+ESelection impGetEndSelection(Outliner *pOutl) const;
 };
 
 class NonOverflowingText {
diff --git a/svx/source/svdraw/textchainflow.cxx 
b/svx/source/svdraw/textchainflow.cxx
index 2647afa..9e794bc 100644
--- a/svx/source/svdraw/textchainflow.cxx
+++ b/svx/source/svdraw/textchainflow.cxx
@@ -63,7 +63,8 @@ void TextChainFlow::impSetFlowOutlinerParams(SdrOutliner *, 
SdrOutliner *)
 void TextChainFlow::impCheckForFlowEvents(SdrOutliner *pFlowOutl, SdrOutliner 
*pParamOutl)
 {
 bool bOldUpdateMode = pFlowOutl->GetUpdateMode();
-// NOTE: Nah you probably don't need this
+
+// XXX: This could be reorganized moving most of this stuff inside 
EditingTextChainFlow (we need update=true anyway for TextChainFlow though)
 if (pParamOutl != NULL)
 {
 // We need this since it's required to check overflow
@@ -83,7 +84,7 @@ void TextChainFlow::impCheckForFlowEvents(SdrOutlin

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - include/svx svx/source

[matteocam]

 include/svx/svdedxv.hxx   |9 +
 svx/source/svdraw/svdedxv.cxx |   64 +++---
 2 files changed, 57 insertions(+), 16 deletions(-)

New commits:
commit e76ca3b674ebd74bdd1ad81dc9ab942c7151f0e1
Author: matteocam 
Date:   Wed Jul 8 09:00:20 2015 -0400

Move to the other box after OF.

Change-Id: I5184cfb09bb796821fa12a07f085bf790d46b792

diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index 010032e..0f9de4d 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -35,6 +35,9 @@ class ImpSdrEditPara;
 struct PasteOrDropInfos;
 class SdrUndoManager;
 
+enum class CursorChainingEvent;
+class ESelection;
+
 namespace com { namespace sun { namespace star { namespace uno {
 class Any;
 } } } }
@@ -94,6 +97,10 @@ private:
 
 SVX_DLLPRIVATE void ImpClearVars();
 
+// FIXME(matteocam)
+CursorChainingEvent *maCursorEvent;
+ESelection *maPreChainingSel;
+
 protected:
 // central method to get an SdrUndoManager for enhanced TextEdit. Default 
will
 // try to return a dynamic_casted GetModel()->GetSdrUndoManager(). 
Applications
@@ -103,6 +110,8 @@ protected:
 
 OutlinerView* ImpFindOutlinerView(vcl::Window* pWin) const;
 
+void ImpMoveCursorAfterChainingEvent();
+
 // Create a new OutlinerView at the heap and initialize all required 
parameters.
 // pTextEditObj, pTextEditPV and pTextEditOutliner have to be initialized
 OutlinerView* ImpMakeOutlinerView(vcl::Window* pWin, bool bNoPaint, 
OutlinerView* pGivenView) const;
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index febb1c5..c09dfb1 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -500,7 +500,7 @@ IMPL_LINK_NOARG(SdrObjEditView,ImpChainingEventHdl)
 pTextChain->SetNilChainingEvent(pTextObj, true);
 
 // Save previous selection pos
-ESelection aPreChainingSel(pOLV->GetSelection());
+maPreChainingSel = new ESelection(pOLV->GetSelection());
 
 // trigger actual chaining
 pTextObj->onChainingEvent();
@@ -508,22 +508,9 @@ IMPL_LINK_NOARG(SdrObjEditView,ImpChainingEventHdl)
 // XXX: this logic could be put in a separate approppriate class
 /* Cursor motion stuff */
 
-CursorChainingEvent aCursorEvent = 
pTextChain->GetCursorEvent(pTextObj);
-SdrTextObj *pNextLink = pTextObj->GetNextLinkInChain();
+maCursorEvent = new 
CursorChainingEvent(pTextChain->GetCursorEvent(pTextObj));
+//SdrTextObj *pNextLink = pTextObj->GetNextLinkInChain();
 
-switch (aCursorEvent) {
-
-case CursorChainingEvent::UNCHANGED:
-pOLV->SetSelection(aPreChainingSel);
-break;
-case CursorChainingEvent::TO_NEXT_LINK:
-//SdrEndTextEdit(true);
-//SdrBeginTextEdit(pNextLink, nullptr, nullptr, false, 
nullptr, nullptr, true, true);
-break;
-case CursorChainingEvent::TO_PREV_LINK:
-// XXX: To be handled
-break;
-}
 
 // Find last Para
 /*
@@ -545,6 +532,47 @@ IMPL_LINK_NOARG(SdrObjEditView,ImpChainingEventHdl)
 return 0;
 }
 
+
+void SdrObjEditView::ImpMoveCursorAfterChainingEvent()
+{
+if (!mxTextEditObj.is())
+return;
+
+SdrTextObj* pTextObj = dynamic_cast(mxTextEditObj.get());
+
+if (!pTextObj->IsChainable() || !pTextObj->GetNextLinkInChain())
+return;
+
+assert(maCursorEvent);
+assert(maPreChainingSel);
+
+SdrTextObj *pNextLink = pTextObj->GetNextLinkInChain();
+OutlinerView* pOLV = GetTextEditOutlinerView();
+
+switch (*maCursorEvent) {
+
+case CursorChainingEvent::UNCHANGED:
+pOLV->SetSelection(*maPreChainingSel);
+break;
+case CursorChainingEvent::TO_NEXT_LINK:
+SdrEndTextEdit();
+SdrBeginTextEdit(pNextLink);
+
+//SdrEndTextEdit(true);
+//SdrBeginTextEdit(pNextLink, nullptr, nullptr, false, 
nullptr, nullptr, true, true);
+break;
+case CursorChainingEvent::TO_PREV_LINK:
+// XXX: To be handled
+break;
+}
+
+// Default case
+// XXX: You should delete the old ones here too.
+maCursorEvent = NULL;
+maPreChainingSel = NULL;
+
+}
+
 IMPL_LINK(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI)
 {
 bool bOk=false;
@@ -1274,6 +1302,10 @@ bool SdrObjEditView::KeyInput(const KeyEvent& rKEvt, 
vcl::Window* pWin)
 if (pItemBrowser!=nullptr) pItemBrowser->SetDirty();
 #endif
 ImpMakeTextCursorAreaVisible();
+
+// FIXME(matteocam)
+ImpMoveCursorAfterChainingEvent();
+
 return true;
 }
 }
_

Re: HelpAuthoring.oxt: An easy way to edit help files

[Jan Holesovsky]

Hi Regina,

Regina Henschel píše v So 04. 07. 2015 v 17:13 +0200:

> > Olivier recently resurrected the HelpAuthoring.oxt extension that makes
> > it much easier to edit help files, and I've pushed that to git now:
> >
> > http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/helpauthoring
> 
> I do not share your euphoria. If you do not already know, how the help 
> is organized, it will not make it "much easier". And for correcting 
> single words and typos, it is not necessary. But I agree, if you know, 
> how the help is organized, it helps you inserting all the tags and 
> attributes.

Yes - let's see how it becomes used.  The good thing about having it in
the git now is that we can fix whatever needs fixing there :-)

Having said that, the filter to load / save .xhp is implemented in xslt;
which is a nightmare; I hope we'll convert it to Python at some stage to
be able to fix stuff there much more effectively - but let's see.

> Removing some old stuff, like the history-element or the "l10n" and 
> "oldref" attributes is nice too.
> 
> >
> > I don't want to announce it too widely yet, tough; it has a bug that
> > from some reason, the new edits appear in bold when saved (they appear
> > enclosed in  / ).
> 
> Unfortunately no solution for that problem. I first thought inserting 
> would create a span element, but saving as odt has no such element.
> 
> But another error: The tool removes the indexer-attribute from the topic 
> element. The value is sometimes intentionally set to "exclude", for to 
> make the file invisible to the full text search. That is necessary, 
> because some files have only content, that is to be embedded in other 
> files. Such files are very confusing to users and should be hidden. When 
> you select "exclude" when you use "Edit Meta Data", this attribute is 
> not set.

Nasty :-(

> Further problems:
> 
> The template has unsuitable fonts, for example a "Droid Sans".
> 
> The page margins of the template are far to large. In help viewer the 
> margins will be about 5mm left and right and 10mm top. Perhaps open the 
> file in Web-view?
> 
> The browse-button for file name search in "Embed Section" does not 
> recognize the path, that has been set in "Set Document Root" and 
> therefore inserts an absolute path.
> 
> The dialog for selecting a section to be embedded does not use unicode 
> in the selection window and therefore the preview is wrong.
> 
> Feature request: Provide a preview of the help, as it would be shown in 
> the help viewer, I mean without the yellow fields.

Thank you for collecting the list - worth looking at that!

All the best,
Kendy

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

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

[Takeshi Abe]

 sdext/README |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3e8cb7da52e84b03b309b68708889fc42789b722
Author: Takeshi Abe 
Date:   Wed Jul 8 21:51:05 2015 +0900

Fix typo

Change-Id: Iec20cfa243e336d36e12e13d36564eacc9db1435

diff --git a/sdext/README b/sdext/README
index ed9aa33..b43d62b 100644
--- a/sdext/README
+++ b/sdext/README
@@ -5,7 +5,7 @@ source/pdfimport/ - PDF import
Uses an external poppler process to parse and handle PDF
import as draw shapes.
 
-source/minimizer/ - Presentation Minizer
+source/minimizer/ - Presentation Minimizer
 
Shrinks presentations by down-scaling images, and removing
extraneous eg. embedded OLE content.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Thorsten Behrens]

 external/libcmis/tdf90351.patch |  111 +---
 1 file changed, 105 insertions(+), 6 deletions(-)

New commits:
commit f3c687a87c4c238286c35adcec54592c2e8cdffa
Author: Thorsten Behrens 
Date:   Wed Jul 8 14:44:09 2015 +0200

tdf#90351: server response does not always contain cmis:baseTypeId

So if we know which object we just created, don't rely on the server
response to tell us. Improvement on the fix from
5c10e8cd0eedefc2dcc905154c4daa142561aef3.

Change-Id: Iddf706fb3b8bef38217a406c806963ba4496c7c9

diff --git a/external/libcmis/tdf90351.patch b/external/libcmis/tdf90351.patch
index fe0e5c5..65d630a 100644
--- a/external/libcmis/tdf90351.patch
+++ b/external/libcmis/tdf90351.patch
@@ -1,10 +1,109 @@
+From 2b85882048847a3d2076a8ac0ed63d905aeea1dd Mon Sep 17 00:00:00 2001
+From: Thorsten Behrens 
+Date: Wed, 8 Jul 2015 14:26:01 +0200
+Subject: [PATCH] tdf#90351: response does not always contain cmis:baseTypeId
+
+So if we know which object we just created, don't rely on the server
+response to tell us.
+---
+ src/libcmis/atom-document.cxx | 4 ++--
+ src/libcmis/atom-folder.cxx   | 4 ++--
+ src/libcmis/atom-session.cxx  | 6 +++---
+ src/libcmis/atom-session.hxx  | 3 ++-
+ 4 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/src/libcmis/atom-document.cxx b/src/libcmis/atom-document.cxx
+index b7f28b3..49cfd45 100644
+--- src/libcmis/atom-document.cxx
 src/libcmis/atom-document.cxx
+@@ -280,7 +280,7 @@ libcmis::DocumentPtr AtomDocument::checkOut( ) throw ( 
libcmis::Exception )
+ if ( NULL == doc )
+ throw libcmis::Exception( "Failed to parse object infos" );
+ 
+-libcmis::ObjectPtr created = getSession( )->createObjectFromEntryDoc( doc 
);
++libcmis::ObjectPtr created = getSession( )->createObjectFromEntryDoc( 
doc, AtomPubSession::RESULT_DOCUMENT );
+ xmlFreeDoc( doc );
+ 
+ libcmis::DocumentPtr pwc = boost::dynamic_pointer_cast< libcmis::Document 
>( created );
+@@ -377,7 +377,7 @@ libcmis::DocumentPtr AtomDocument::checkIn( bool isMajor, 
string comment,
+ throw libcmis::Exception( "Failed to parse object infos" );
+ 
+ 
+-libcmis::ObjectPtr newVersion = getSession( )->createObjectFromEntryDoc( 
doc );
++libcmis::ObjectPtr newVersion = getSession( )->createObjectFromEntryDoc( 
doc, AtomPubSession::RESULT_DOCUMENT );
+ 
+ if ( newVersion->getId( ) == getId( ) )
+ refreshImpl( doc );
+diff --git a/src/libcmis/atom-folder.cxx b/src/libcmis/atom-folder.cxx
+index 7947883..55ac2a9 100644
+--- src/libcmis/atom-folder.cxx
 src/libcmis/atom-folder.cxx
+@@ -170,7 +170,7 @@ libcmis::FolderPtr AtomFolder::createFolder( const 
PropertyPtrMap& properties )
+ if ( NULL == doc )
+ throw libcmis::Exception( "Failed to parse object infos" );
+ 
+-libcmis::ObjectPtr created = getSession( )->createObjectFromEntryDoc( doc 
);
++libcmis::ObjectPtr created = getSession( )->createObjectFromEntryDoc( 
doc, AtomPubSession::RESULT_FOLDER );
+ xmlFreeDoc( doc );
+ 
+ libcmis::FolderPtr newFolder = boost::dynamic_pointer_cast< 
libcmis::Folder >( created );
+@@ -244,7 +244,7 @@ libcmis::DocumentPtr AtomFolder::createDocument( const 
PropertyPtrMap& propertie
+ throw libcmis::Exception( "Missing expected response from server" 
);
+ }
+ 
+-libcmis::ObjectPtr created = getSession( )->createObjectFromEntryDoc( doc 
);
++libcmis::ObjectPtr created = getSession( )->createObjectFromEntryDoc( 
doc, AtomPubSession::RESULT_DOCUMENT );
+ xmlFreeDoc( doc );
+ 
+ libcmis::DocumentPtr newDocument = boost::dynamic_pointer_cast< 
libcmis::Document >( created );
+diff --git a/src/libcmis/atom-session.cxx b/src/libcmis/atom-session.cxx
+index ffa93a7..e470884 100644
 --- src/libcmis/atom-session.cxx
 +++ src/libcmis/atom-session.cxx
-@@ -233,6 +233,7 @@ libcmis::ObjectPtr 
AtomPubSession::createObjectFromEntryDoc( xmlDocPtr doc )
- else
+@@ -201,7 +201,7 @@ bool AtomPubSession::setRepository( string repositoryId )
+ return found;
+ }
+ 
+-libcmis::ObjectPtr AtomPubSession::createObjectFromEntryDoc( xmlDocPtr doc )
++libcmis::ObjectPtr AtomPubSession::createObjectFromEntryDoc( xmlDocPtr doc, 
ResultObjectType res )
+ {
+ libcmis::ObjectPtr cmisObject;
+ 
+@@ -222,11 +222,11 @@ libcmis::ObjectPtr 
AtomPubSession::createObjectFromEntryDoc( xmlDocPtr doc )
+ string baseType = libcmis::getXPathValue( xpathCtx, 
baseTypeReq );
+ 
+ xmlNodePtr node = xpathObj->nodesetval->nodeTab[0];
+-if ( baseType == "cmis:folder" )
++if ( res == RESULT_FOLDER || baseType == "cmis:folder" )
  {
- // Not a valid CMIS atom entry... weird
-+cmisObject.reset( new AtomDocument( this, node ) );
+ cmisObject.reset( new AtomFolder( this, node ) );
  }
- }
- xmlXPathFreeObject( xpathOb

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

[Stephan Bergmann]

 stoc/source/inspect/introspection.cxx |   70 --
 1 file changed, 18 insertions(+), 52 deletions(-)

New commits:
commit f0c4130746e7b61029ce90f24e69a3203b547e54
Author: Stephan Bergmann 
Date:   Wed Jul 8 14:30:27 2015 +0200

Use OUString::starts/endsWith

Change-Id: I88effbf6f88dfb286f85f8fbd06bab8033aca6b0

diff --git a/stoc/source/inspect/introspection.cxx 
b/stoc/source/inspect/introspection.cxx
index 9f061ae..e6b9110 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -1972,12 +1972,9 @@ css::uno::Reference 
Implementation::inspect(
 continue;
 
 // Ist es eine get-Methode?
-OUString aStartStr = aMethName.copy( 0, 3 );
-if( aStartStr == "get" )
+OUString aPropName;
+if( aMethName.startsWith("get", &aPropName) )
 {
-// Namen der potentiellen Property
-OUString aPropName = aMethName.copy( 3 );
-
 // get-Methode darf keinen Parameter haben
 Sequence< Reference > getParams = 
rxMethod_i->getParameterTypes();
 if( getParams.getLength() > 0 )
@@ -2044,13 +2041,9 @@ css::uno::Reference 
Implementation::inspect(
 
 // Name holen und auswerten
 OUString aMethName2 = rxMethod_k->getName();
-OUString aStartStr2 = aMethName2.copy( 0, 3 );
-if( aStartStr2 != "set" )
-continue;
-
-// Ist es denn der gleiche Name?
-OUString aPropName2 = aMethName2.copy( 3 );
-if( aPropName != aPropName2 )
+OUString aPropName2;
+if (!(aMethName2.startsWith("set", &aPropName2)
+  && aPropName2 == aPropName))
 continue;
 
 // set-Methode muss void returnen
@@ -2092,22 +2085,13 @@ css::uno::Reference 
Implementation::inspect(
 }
 
 // Ist es eine addListener-Methode?
-else if( aStartStr == "add" )
+else if( aMethName.startsWith("add", &aPropName) )
 {
-OUString aListenerStr( "Listener" );
-
-// Namen der potentiellen Property
-sal_Int32 nStrLen = aMethName.getLength();
-sal_Int32 nCopyLen = nStrLen - 
aListenerStr.getLength();
-OUString aEndStr = aMethName.copy( nCopyLen > 0 ? 
nCopyLen : 0 );
-
 // Endet das Teil auf Listener?
-if( aEndStr != aListenerStr )
+OUString aListenerName;
+if( !aPropName.endsWith("Listener", 
&aListenerName) )
 continue;
 
-// Welcher Listener?
-OUString aListenerName = aMethName.copy( 3, 
nStrLen - aListenerStr.getLength() - 3 );
-
 // TODO: Hier koennten noch genauere Pruefungen 
vorgenommen werden
 // - Rueckgabe-Typ
 // - Anzahl und Art der Parameter
@@ -2126,19 +2110,12 @@ css::uno::Reference 
Implementation::inspect(
 
 // Name holen und auswerten
 OUString aMethName2 = rxMethod_k->getName();
-sal_Int32 nNameLen = aMethName2.getLength();
-sal_Int32 nCopyLen2 = (nNameLen < 6) ? 
nNameLen : 6;
-OUString aStartStr2 = aMethName2.copy( 0, 
nCopyLen2 );
-OUString aRemoveStr("remove" );
-if( aStartStr2 != aRemoveStr )
-continue;
-
-// Ist es denn der gleiche Listener?
-if( aMethName2.getLength() - 
aRemoveStr.getLength() <= aListenerStr.getLength() )
-continue;
-OUString aListenerName2 = aMethName2.copy
-  ( 6, aMethName2.getLength() - 
aRemoveStr.getLength() - aListenerStr.getLength() );
-if( aListenerName != aListenerName2 )
+OUString aListenerName2;
+if (!(aMethName2.startsWith(
+  "remove", &aPropName)
+ 

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

[Andras Timar]

 external/libcmis/UnpackedTarball_cmis.mk |1 +
 external/libcmis/tdf90351.patch  |   10 ++
 2 files changed, 11 insertions(+)

New commits:
commit 5c10e8cd0eedefc2dcc905154c4daa142561aef3
Author: Andras Timar 
Date:   Wed Jul 8 14:16:55 2015 +0200

tdf#90351 libcmis: prevent crash

Change-Id: I2d9673bb261a2586e1802f025c900962249cfc42
Reviewed-on: https://gerrit.libreoffice.org/16854
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/external/libcmis/UnpackedTarball_cmis.mk 
b/external/libcmis/UnpackedTarball_cmis.mk
index 16d4400..b4b596b 100644
--- a/external/libcmis/UnpackedTarball_cmis.mk
+++ b/external/libcmis/UnpackedTarball_cmis.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,cmis,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,cmis, \

external/libcmis/libcmis-libxml2_compatibility.patch \
+   external/libcmis/tdf90351.patch 
\
 ))
 
 ifeq ($(OS)$(COM),WNTMSC)
diff --git a/external/libcmis/tdf90351.patch b/external/libcmis/tdf90351.patch
new file mode 100644
index 000..fe0e5c5
--- /dev/null
+++ b/external/libcmis/tdf90351.patch
@@ -0,0 +1,10 @@
+--- src/libcmis/atom-session.cxx
 src/libcmis/atom-session.cxx
+@@ -233,6 +233,7 @@ libcmis::ObjectPtr 
AtomPubSession::createObjectFromEntryDoc( xmlDocPtr doc )
+ else
+ {
+ // Not a valid CMIS atom entry... weird
++cmisObject.reset( new AtomDocument( this, node ) );
+ }
+ }
+ xmlXPathFreeObject( xpathObj );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

New Defects reported by Coverity Scan for LibreOffice

[scan-admin]

Hi,

Please find the latest report on new defect(s) introduced to LibreOffice found 
with Coverity Scan.

6 new defect(s) introduced to LibreOffice found with Coverity Scan.
12 defect(s), reported by Coverity Scan earlier, were marked fixed in the 
recent build analyzed by Coverity Scan.

New defect(s) Reported-by: Coverity Scan
Showing 6 of 6 defect(s)


** CID 1311336:  Uninitialized members  (UNINIT_CTOR)
/cui/source/options/optaboutconfig.cxx: 68 in UserData::UserData(const 
rtl::OUString &)()



*** CID 1311336:  Uninitialized members  (UNINIT_CTOR)
/cui/source/options/optaboutconfig.cxx: 68 in UserData::UserData(const 
rtl::OUString &)()
62 int aLineage;
63 Reference aXNameAccess;
64 
65 explicit UserData( OUString const & rPropertyPath )
66 : bIsPropertyPath( true )
67 , sPropertyPath(rPropertyPath)
>>> CID 1311336:  Uninitialized members  (UNINIT_CTOR)
>>> Non-static class member "aLineage" is not initialized in this 
>>> constructor nor in any functions that it calls.
68 {}
69 
70 explicit UserData( Reference const & rXNameAccess, int 
rIndex = 0 )
71 : bIsPropertyPath( false )
72 , aLineage(rIndex)
73 , aXNameAccess( rXNameAccess )

** CID 1311335:  Error handling issues  (UNCAUGHT_EXCEPT)
/sc/source/ui/vba/vbaapplication.cxx: 1066 in 
::lclCreateVbaRange(const 
com::sun::star::uno::Reference &, const 
com::sun::star::uno::Reference &, const 
std::list> &)()



*** CID 1311335:  Error handling issues  (UNCAUGHT_EXCEPT)
/sc/source/ui/vba/vbaapplication.cxx: 1066 in 
::lclCreateVbaRange(const 
com::sun::star::uno::Reference &, const 
com::sun::star::uno::Reference &, const 
std::list> &)()
1060 // again, join the result ranges
1061 lclJoinRanges( rList );
1062 }
1063 }
1064 
1065 /** Creates a VBA Range object from the passed list of ranges. */
>>> CID 1311335:  Error handling issues  (UNCAUGHT_EXCEPT)
>>> An exception of type "std::length_error" is thrown but the throw list 
>>> "throw(com::sun::star::uno::RuntimeException)" doesn't allow it to be 
>>> thrown. This will cause a call to unexpected() which usually calls 
>>> terminate().
1066 uno::Reference< excel::XRange > lclCreateVbaRange(
1067 const uno::Reference< uno::XComponentContext >& rxContext,
1068 const uno::Reference< frame::XModel >& rxModel,
1069 const ListOfScRange& rList ) throw (uno::RuntimeException)
1070 {
1071 ScDocShell* pDocShell = excel::getDocShell( rxModel );

** CID 1311334:  Error handling issues  (UNCAUGHT_EXCEPT)
/sc/source/ui/vba/vbaeventshelper.cxx: 860 in 
ScVbaEventsHelper::createRange(const 
com::sun::star::uno::Sequence &, int) const()



*** CID 1311334:  Error handling issues  (UNCAUGHT_EXCEPT)
/sc/source/ui/vba/vbaeventshelper.cxx: 860 in 
ScVbaEventsHelper::createRange(const 
com::sun::star::uno::Sequence &, int) const()
854 {
855 // extract sheet index, will throw, if parameter is invalid
856 SCTAB nTab = lclGetTabFromArgs( rArgs, nIndex );
857 return uno::Any( excel::getUnoSheetModuleObj( mxModel, nTab ) );
858 }
859 
>>> CID 1311334:  Error handling issues  (UNCAUGHT_EXCEPT)
>>> An exception of type "std::length_error" is thrown but the throw list 
>>> "throw(com::sun::star::uno::RuntimeException, 
>>> com::sun::star::lang::IllegalArgumentException)" doesn't allow it to be 
>>> thrown. This will cause a call to unexpected() which usually calls 
>>> terminate().
860 uno::Any ScVbaEventsHelper::createRange( const uno::Sequence< uno::Any 
>& rArgs, sal_Int32 nIndex ) const
861 throw (lang::IllegalArgumentException, uno::RuntimeException)
862 {
863 // it is possible to pass an existing VBA Range object
864 uno::Reference< excel::XRange > xVbaRange = getXSomethingFromArgs< 
excel::XRange >( rArgs, nIndex );
865 if( !xVbaRange.is() )

** CID 1311333:  Error handling issues  (UNCAUGHT_EXCEPT)
/sc/source/ui/vba/vbarange.cxx: 1238 in getRangeForName(const 
com::sun::star::uno::Reference &, const 
rtl::OUString &, ScDocShell *, com::sun::star::table::CellRangeAddress &, 
formula::FormulaGrammar::AddressConvention)()



*** CID 1311333:  Error handling issues  (UNCAUGHT_EXCEPT)
/sc/source/ui/vba/vbarange.cxx: 1238 in getRangeForName(const 
com::sun::star::uno::Reference &, const 
rtl::OUString &, ScDocShell *, com::sun::star::table::CellRangeAddress &, 
formula::FormulaGrammar::AddressConvention)()
1232   

[Libreoffice-commits] core.git: config_host/config_dconf.h.in config_host.mk.in configmgr/CppunitTest_configmgr_unit.mk configmgr/Library_configmgr.mk configmgr/source configure.ac distro-configs/Libr

[Stephan Bergmann]

 RepositoryExternal.mk   |5 
 config_host.mk.in   |3 
 config_host/config_dconf.h.in   |   17 
 configmgr/CppunitTest_configmgr_unit.mk |1 
 configmgr/Library_configmgr.mk  |8 
 configmgr/source/components.cxx |   14 
 configmgr/source/readdconflayer.cxx |  931 
 configmgr/source/readdconflayer.hxx |   25 
 configure.ac|   29 
 distro-configs/LibreOfficeLinux.conf|1 
 include/sal/log-areas.dox   |1 
 instsetoo_native/CustomTarget_setup.mk  |2 
 scp2/source/ooo/common_brand.scp|   19 
 13 files changed, 1048 insertions(+), 8 deletions(-)

New commits:
commit ecc617e797aa5ed329668114e54ec7ffa5c0e87b
Author: Stephan Bergmann 
Date:   Wed Jul 8 11:20:19 2015 +0200

configmgr: support reading from a dconf layer (WIP)

Work in progress to allow integration of LO with
.

During configuration, dconf support is implicitly enabled when available on 
the
host (which is presumably only available on Linux).  It is explicitly 
disabled
for TDF Linux builds for now, though, to avoid accidental dependencies of 
the
distributed installation sets on system dconf libraries.

A dconf layer is represented in the CONFIGURATION_LAYERS bootstrap variable 
with
type "dconf" and an empty URL.  See the comment at the top of
configmgr/source/readdconflayer.cxx for the encoding of component-data in 
dconf.

All of this is still subject to change.

Change-Id: I2d08d81c8ea43ba4a99040a8882ae75b91bcfdb9
Reviewed-on: https://gerrit.libreoffice.org/16848
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index a0a0d61..75f033f 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3584,6 +3584,11 @@ endif # ENABLE_COLLADA
 
 endif # ENABLE_GLTF
 
+define gb_LinkTarget__use_dconf
+$(call gb_LinkTarget_add_defs,$(1),$(DCONF_CFLAGS))
+$(call gb_LinkTarget_add_libs,$(1),$(DCONF_LIBS))
+endef
+
 ### Jars 
 
 ifneq ($(SYSTEM_HSQLDB),)
diff --git a/config_host.mk.in b/config_host.mk.in
index 1d0702b..2a20b8b 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -91,6 +91,8 @@ export DBUSMENUGTK_CFLAGS=$(gb_SPACE)@DBUSMENUGTK_CFLAGS@
 export DBUSMENUGTK_LIBS=$(gb_SPACE)@DBUSMENUGTK_LIBS@
 export DBUS_CFLAGS=$(gb_SPACE)@DBUS_CFLAGS@
 export DBUS_LIBS=$(gb_SPACE)@DBUS_LIBS@
+export DCONF_CFLAGS=@DCONF_CFLAGS@
+export DCONF_LIBS=@DCONF_LIBS@
 export DEFAULT_BRAND_IMAGES=@DEFAULT_BRAND_IMAGES@
 export DIAGRAM_EXTENSION_PACK=@DIAGRAM_EXTENSION_PACK@
 export DICT_SYSTEM_DIR=@DICT_SYSTEM_DIR@
@@ -122,6 +124,7 @@ export ENABLE_CUPS=@ENABLE_CUPS@
 export ENABLE_CURL=@ENABLE_CURL@
 export ENABLE_DBGUTIL=@ENABLE_DBGUTIL@
 export ENABLE_DBUS=@ENABLE_DBUS@
+export ENABLE_DCONF=@ENABLE_DCONF@
 export ENABLE_DEBUG=@ENABLE_DEBUG@
 export ENABLE_DEBUGINFO_FOR=@ENABLE_DEBUGINFO_FOR@
 export ENABLE_DIRECTX=@ENABLE_DIRECTX@
diff --git a/config_host/config_dconf.h.in b/config_host/config_dconf.h.in
new file mode 100644
index 000..09608c4
--- /dev/null
+++ b/config_host/config_dconf.h.in
@@ -0,0 +1,17 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_CONFIG_DCONF_H
+#define INCLUDED_CONFIG_DCONF_H
+
+#define ENABLE_DCONF 0
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configmgr/CppunitTest_configmgr_unit.mk 
b/configmgr/CppunitTest_configmgr_unit.mk
index 1672c9f..e8bddc2 100644
--- a/configmgr/CppunitTest_configmgr_unit.mk
+++ b/configmgr/CppunitTest_configmgr_unit.mk
@@ -49,5 +49,6 @@ $(eval $(call gb_CppunitTest_use_components,configmgr_unit,\
 
 $(eval $(call gb_CppunitTest_use_externals,configmgr_unit,\
 boost_headers \
+dconf \
 icu_headers \
 ))
diff --git a/configmgr/Library_configmgr.mk b/configmgr/Library_configmgr.mk
index 528b150..36c316a 100644
--- a/configmgr/Library_configmgr.mk
+++ b/configmgr/Library_configmgr.mk
@@ -38,15 +38,19 @@ $(eval $(call gb_Library_add_exception_objects,configmgr, \
 configmgr/source/type \
 configmgr/source/update \
 configmgr/source/valueparser \
-$(if $(filter $(OS),WNT), configmgr/source/winreg ) \
 configmgr/source/writemodfile \
 configmgr/source/xcdparser \
 configmgr/source/xcsparser \
 configmgr/source/xcuparser \
 configmgr/source/xmldata \
+$(if $(ENABLE_DCONF),configmgr/source/readdconflayer) \
+$(if $(filter $(OS),WNT),configmgr/source/winreg) \
 ))
 
-$(eval $(call gb_Libr

Gsoc weekly report(Week #6)

[Rishabh Kumar]

This week I worked on -
1. Completed the task of SlideBackground tab: (Some minor bug fixing needed)
2. Completed the area tab work.
3. Moved the effects list to the animation tab (#87813) [work in progress]
4. Refactored the code for sidebar selection analyzer for writer as a
follow up for the commit https://gerrit.libreoffice.org/#/c/16165/ [work in
progress]
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot]

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

New commits:
commit 8caef148f4ce5f811588390c24bda41a1390093d
Author: Olivier Hallot 
Date:   Fri Jun 5 16:37:28 2015 -0300

Updated core
Project: help  fd9b00bd84e3fe1a0aa087f5355aa0fcd27ef95f

Promote ODF Formula standard in Calc function help

Insert ODF Formula standard citation in Calc functions where it applies. In 
this example, function TIMEVALUE is a standard ODF Formula 1.2 function.

Many other functions qualify to be a ODFF function. But since Excel is 
changing its function names, not every Calc function is and ODFF funciton.

Change-Id: Ib764d780f9f66c8a7adaba8954d91fc9b4d70410
Reviewed-on: https://gerrit.libreoffice.org/16110
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/helpcontent2 b/helpcontent2
index f36f288..fd9b00b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit f36f2883973e4ba6d59ee8d0d9b3e98273aa1c44
+Subproject commit fd9b00bd84e3fe1a0aa087f5355aa0fcd27ef95f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: AllLangHelp_scalc.mk source/text

[Olivier Hallot]

 AllLangHelp_scalc.mk|1 
 source/text/scalc/01/ODFF.xhp   |   35 +
 source/text/scalc/01/func_timevalue.xhp |   85 +++-
 3 files changed, 76 insertions(+), 45 deletions(-)

New commits:
commit fd9b00bd84e3fe1a0aa087f5355aa0fcd27ef95f
Author: Olivier Hallot 
Date:   Fri Jun 5 16:37:28 2015 -0300

Promote ODF Formula standard in Calc function help

Insert ODF Formula standard citation in Calc functions where it applies. In 
this example, function TIMEVALUE is a standard ODF Formula 1.2 function.

Many other functions qualify to be a ODFF function. But since Excel is 
changing its function names, not every Calc function is and ODFF funciton.

Change-Id: Ib764d780f9f66c8a7adaba8954d91fc9b4d70410
Reviewed-on: https://gerrit.libreoffice.org/16110
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk
index 49434ca..9987151 100644
--- a/AllLangHelp_scalc.mk
+++ b/AllLangHelp_scalc.mk
@@ -210,6 +210,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
 helpcontent2/source/text/scalc/01/solver_options \
 helpcontent2/source/text/scalc/01/statistics \
 helpcontent2/source/text/scalc/01/stat_data \
+helpcontent2/source/text/scalc/01/ODFF \
 helpcontent2/source/text/scalc/01/text2columns \
 helpcontent2/source/text/scalc/02/0213 \
 helpcontent2/source/text/scalc/02/0214 \
diff --git a/source/text/scalc/01/ODFF.xhp b/source/text/scalc/01/ODFF.xhp
new file mode 100644
index 000..85aebf9
--- /dev/null
+++ b/source/text/scalc/01/ODFF.xhp
@@ -0,0 +1,35 @@
+
+
+
+ 
+
+
+ODFF
+text/scalc/01/ODFF.xhp
+
+
+
+
+This function is a 
standard Open Document Formula version 1.2 function.
+
+
+
\ No newline at end of file
diff --git a/source/text/scalc/01/func_timevalue.xhp 
b/source/text/scalc/01/func_timevalue.xhp
index 97f35db..d986caf 100644
--- a/source/text/scalc/01/func_timevalue.xhp
+++ b/source/text/scalc/01/func_timevalue.xhp
@@ -1,51 +1,46 @@
-
+
 
-   
-
+
  
-   
 
-  
- TIMEVALUE 
- /text/scalc/01/func_timevalue.xhp
-  
-   
-   
-TIMEVALUE function
+
+TIMEVALUE 
+file:///home/tdf/git/core/helpcontent2/source/text/scalc/01/func_timevalue.xhp
+
+
+
+
+TIMEVALUE function
 
 
-TIMEVALUE
-
-  TIMEVALUE returns the internal time 
number from a text enclosed by quotes and which may show a possible time entry 
format.
-  The internal number indicated as a decimal is the result of the 
date system used under $[officename] to calculate date entries.
-  If the text string also includes a year, month, or day, TIMEVALUE 
only returns the fractional part of the conversion.
-  Syntax
-  TIMEVALUE("Text")
-  
- Text is a valid time expression and must be entered in 
quotation marks.
-  Examples
-  
- =TIMEVALUE("4PM") returns 0.67. When 
formatting in time format HH:MM:SS, you then get 16:00:00.
-  
- =TIMEVALUE("24:00") returns 1. If you use 
the HH:MM:SS time format, the value is 00:00:00.
-   
+TIMEVALUE
+TIMEVALUE returns the internal time number from a text 
enclosed by quotes and which may show a possible time entry 
format.
+The internal 
number indicated as a decimal is the result of the date system used under 
$[officename] to calculate date entries.
+If the 
text string also includes a year, month, or day, TIMEVALUE only returns the 
fractional part of the conversion.
+Syntax
+TIMEVALUE("Text")
+Text is a valid time expression and must be 
entered in quotation marks.
+Examples
+=TIMEVALUE("4PM") returns 0.67. When formatting in time 
format HH:MM:SS, you then get 16:00:00.
+=TIMEVALUE("24:00") returns 1. If you use the HH:MM:SS time 
format, the value is 00:00:00.
+
 
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/inc/scmatrix.hxx  |3 +++
 sc/source/core/tool/interpr5.cxx |   10 +-
 sc/source/core/tool/scmatrix.cxx |   13 +
 3 files changed, 21 insertions(+), 5 deletions(-)

New commits:
commit f5427fa4d7cb9ad79d68d0760030ca998ca1d0e5
Author: Eike Rathke 
Date:   Mon Jul 6 16:48:42 2015 +0200

use ScMatrix::IsValueOrEmpty() on math operators Mul/Div/Pow, tdf#91453

... which aren't implemented at ScMatrix yet. Using IsValue() worked
when errors were not propagated, and before that when errors were
propagated because ScMatrix didn't have empty elements but instead was
initialized to 0.0

Change-Id: Ib9c6d34f2e6a68e483b606923cbcc41a3c1d2f51
Reviewed-on: https://gerrit.libreoffice.org/16799
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx
index 27d3777..63284e9 100644
--- a/sc/inc/scmatrix.hxx
+++ b/sc/inc/scmatrix.hxx
@@ -342,6 +342,9 @@ public:
 bool IsValue( SCSIZE nC, SCSIZE nR ) const;
 
 /// @return  if value or boolean or empty or empty path.
+bool IsValueOrEmpty( SCSIZE nIndex ) const;
+
+/// @return  if value or boolean or empty or empty path.
 bool IsValueOrEmpty( SCSIZE nC, SCSIZE nR ) const;
 
 /// @return  if boolean.
diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index 3aab1c2..4a093be 100644
--- a/sc/source/core/tool/interpr5.cxx
+++ b/sc/source/core/tool/interpr5.cxx
@@ -1471,7 +1471,7 @@ void ScInterpreter::ScMul()
 {
 SCSIZE nCount = nC * nR;
 for ( SCSIZE i = 0; i < nCount; i++ )
-if (pMat->IsValue(i))
+if (pMat->IsValueOrEmpty(i))
 pResMat->PutDouble(pMat->GetDouble(i)*fVal, i);
 else
 pResMat->PutError( errNoValue, i);
@@ -1550,14 +1550,14 @@ void ScInterpreter::ScDiv()
 SCSIZE nCount = nC * nR;
 if (bFlag)
 {   for ( SCSIZE i = 0; i < nCount; i++ )
-if (pMat->IsValue(i))
+if (pMat->IsValueOrEmpty(i))
 pResMat->PutDouble( div( fVal, pMat->GetDouble(i)), i);
 else
 pResMat->PutError( errNoValue, i);
 }
 else
 {   for ( SCSIZE i = 0; i < nCount; i++ )
-if (pMat->IsValue(i))
+if (pMat->IsValueOrEmpty(i))
 pResMat->PutDouble( div( pMat->GetDouble(i), fVal), i);
 else
 pResMat->PutError( errNoValue, i);
@@ -1629,14 +1629,14 @@ void ScInterpreter::ScPow()
 SCSIZE nCount = nC * nR;
 if (bFlag)
 {   for ( SCSIZE i = 0; i < nCount; i++ )
-if (pMat->IsValue(i))
+if (pMat->IsValueOrEmpty(i))
 pResMat->PutDouble(pow(fVal,pMat->GetDouble(i)), i);
 else
 pResMat->PutError( errNoValue, i);
 }
 else
 {   for ( SCSIZE i = 0; i < nCount; i++ )
-if (pMat->IsValue(i))
+if (pMat->IsValueOrEmpty(i))
 pResMat->PutDouble(pow(pMat->GetDouble(i),fVal), i);
 else
 pResMat->PutError( errNoValue, i);
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 90b2376..707337e 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -259,6 +259,7 @@ public:
 bool IsEmptyPath( SCSIZE nC, SCSIZE nR ) const;
 bool IsValue( SCSIZE nIndex ) const;
 bool IsValue( SCSIZE nC, SCSIZE nR ) const;
+bool IsValueOrEmpty( SCSIZE nIndex ) const;
 bool IsValueOrEmpty( SCSIZE nC, SCSIZE nR ) const;
 bool IsBoolean( SCSIZE nC, SCSIZE nR ) const;
 bool IsNumeric() const;
@@ -749,6 +750,13 @@ bool ScMatrixImpl::IsValue( SCSIZE nC, SCSIZE nR ) const
 return false;
 }
 
+bool ScMatrixImpl::IsValueOrEmpty( SCSIZE nIndex ) const
+{
+SCSIZE nC, nR;
+CalcPosition(nIndex, nC, nR);
+return IsValueOrEmpty(nC, nR);
+}
+
 bool ScMatrixImpl::IsValueOrEmpty( SCSIZE nC, SCSIZE nR ) const
 {
 ValidColRowReplicated(nC, nR);
@@ -2364,6 +2372,11 @@ bool ScMatrix::IsValue( SCSIZE nC, SCSIZE nR ) const
 return pImpl->IsValue(nC, nR);
 }
 
+bool ScMatrix::IsValueOrEmpty( SCSIZE nIndex ) const
+{
+return pImpl->IsValueOrEmpty(nIndex);
+}
+
 bool ScMatrix::IsValueOrEmpty( SCSIZE nC, SCSIZE nR ) const
 {
 return pImpl->IsValueOrEmpty(nC, nR);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-3' - loleaflet/src

[Mihai Varga]

 loleaflet/src/layer/tile/GridLayer.js |4 ++--
 loleaflet/src/layer/tile/TileLayer.js |6 --
 2 files changed, 2 insertions(+), 8 deletions(-)

New commits:
commit 025a95c6689bb9939c10c5ca6b543165a4f4f9aa
Author: Mihai Varga 
Date:   Wed Jul 8 14:45:18 2015 +0300

loleaflet: disable fade Animation as it still causes problems

diff --git a/loleaflet/src/layer/tile/GridLayer.js 
b/loleaflet/src/layer/tile/GridLayer.js
index 79875ef..b658b28 100644
--- a/loleaflet/src/layer/tile/GridLayer.js
+++ b/loleaflet/src/layer/tile/GridLayer.js
@@ -36,6 +36,7 @@ L.GridLayer = L.Layer.extend({
this._tiles = {};
this._tileCache = {};
 
+   this._map._fadeAnimated = false;
this._viewReset();
this._update();
this._map._docLayer = this;
@@ -453,7 +454,6 @@ L.GridLayer = L.Layer.extend({
},
 
_move: function () {
-   this._skipFadeAnimated = false;
this._update();
},
 
@@ -692,7 +692,7 @@ L.GridLayer = L.Layer.extend({
if (!tile) { return; }
 
tile.loaded = +new Date();
-   if (this._map._fadeAnimated && !this._skipFadeAnimated) {
+   if (this._map._fadeAnimated) {
L.DomUtil.setOpacity(tile.el, 0);
L.Util.cancelAnimFrame(this._fadeFrame);
this._fadeFrame = 
L.Util.requestAnimFrame(this._updateOpacity, this);
diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 37bbe44..dad1cea 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -419,11 +419,6 @@ L.TileLayer = L.GridLayer.extend({
key = this._tileCoordsToKey(coords);
var tile = this._tiles[key];
if (tile) {
-   if (tile.el.src) {
-   // cancel the animFade if there's any
-   L.DomUtil.setOpacity(tile.el, 1);
-   this._skipFadeAnimated = true;
-   }
if (this._tiles[key]._invalidCount > 0) {
this._tiles[key]._invalidCount -= 1;
}
@@ -1025,7 +1020,6 @@ L.TileLayer = L.GridLayer.extend({
 
_onZoom: function (e) {
if (e.type === 'zoomstart') {
-   this._skipFadeAnimated = true;
}
else if (e.type === 'zoomend') {
this._onUpdateCursor();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/qa/extras/ooxmlimport/data/tdf90611.docx   |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  |   10 ++
 writerfilter/source/dmapper/DomainMapper.cxx  |2 +-
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   13 +
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |4 
 5 files changed, 28 insertions(+), 1 deletion(-)

New commits:
commit 16626008162545d3caec72fbffc4c19a79326a74
Author: Miklos Vajna 
Date:   Mon Jul 6 09:23:40 2015 +0200

tdf#90611 DOCX import: fix missing paragraph style on footnotes

One one hand, a problem since commit
330b860205c7ba69dd6603f65324d0f89ad9cd5f (fdo#68787 DOCX import: handle
when w:separator is missing for footnotes, 2013-09-04) was that the type
attribute from  resulted in two
ooxml:CT_FtnEdn_type tokens, ignoring too many paragraph ends for
footnotes, which resulted in missing paragraph style on footnotes.

On the other hand, fixing the first problem showed that it wasn't
correct that commit 9389cf78e304a5a99bcf1745b9388e14ac36281a (cp#118
RTF import: empty para at the end of footnote text got lost, 2013-11-15)
unconditionally removed the RemoveLastParagraph() call in
DomainMapper_Impl::PopFootOrEndnote(). It turns out that RTF and DOCX
have different semantics here, the footnote is always within a 
pair in DOCX, while in RTF a \par at the end of a
footnote means an empty paragraph. Fix that by conditionally restoring
the removed RemoveLastParagraph() call.

(cherry picked from commit 519b34300f73b1e08f6194d6ba49d4fc010cf186)

Change-Id: I33020ac761c94addfec8164a17863565e4453b07
Reviewed-on: https://gerrit.libreoffice.org/16810
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/qa/extras/ooxmlimport/data/tdf90611.docx 
b/sw/qa/extras/ooxmlimport/data/tdf90611.docx
new file mode 100644
index 000..ac54fee
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf90611.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index d8cd372..2bac72a 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2725,6 +2725,16 @@ DECLARE_OOXMLIMPORT_TEST(testTdf87460, "tdf87460.docx")
 CPPUNIT_ASSERT_EQUAL(static_cast(1), xEndnotes->getCount());
 }
 
+DECLARE_OOXMLIMPORT_TEST(testTdf90611, "tdf90611.docx")
+{
+uno::Reference xFootnotesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xFootnotes(xFootnotesSupplier->getFootnotes(), uno::UNO_QUERY);
+uno::Reference xFootnoteText;
+xFootnotes->getByIndex(0) >>= xFootnoteText;
+// This was 11.
+CPPUNIT_ASSERT_EQUAL(10.f, getProperty(getParagraphOfText(1, 
xFootnoteText), "CharHeight"));
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 5542cca..d78aca7 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -991,7 +991,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
 case NS_ooxml::LN_CT_FtnEdn_type:
 // This is the "separator" footnote, ignore its linebreak.
 if (static_cast(nIntValue) == 
NS_ooxml::LN_Value_doc_ST_FtnEdn_separator)
-m_pImpl->m_bIgnoreNextPara = true;
+m_pImpl->SeenFootOrEndnoteSeparator();
 break;
 case NS_ooxml::LN_CT_DataBinding_prefixMappings:
 m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, 
"ooxml:CT_DataBinding_prefixMappings", sStringValue);
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 944fdf3..5ff66e9 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -208,6 +208,7 @@ DomainMapper_Impl::DomainMapper_Impl(
 m_bInHeaderFooterImport( false ),
 m_bDiscardHeaderFooter( false ),
 m_bInFootOrEndnote(false),
+m_bSeenFootOrEndnoteSeparator(false),
 m_bLineNumberingSet( false ),
 m_bIsInFootnoteProperties( false ),
 m_bIsCustomFtnMark( false ),
@@ -1747,6 +1748,9 @@ void DomainMapper_Impl::PushAnnotation()
 
 void DomainMapper_Impl::PopFootOrEndnote()
 {
+if (!IsRTFImport())
+RemoveLastParagraph();
+
 // In case the foot or endnote did not contain a tab.
 m_bIgnoreNextTab = false;
 
@@ -1759,9 +1763,18 @@ void DomainMapper_Impl::PopFootOrEndnote()
 return;
 }
 m_aRedlines.pop();
+m_bSeenFootOrEndnoteSeparator = false;
 m_bInFootOrEndnote = false;
 }
 
+void DomainMapper_Impl::SeenFootOrEndnoteSeparator()
+{
+if (!m_bSeenFootOrEndnoteSeparator)
+{
+m_bSeenFootOrEndnoteSeparator = true;
+m_bIgnoreNextPara = true;
+}
+}
 
 void DomainMapper_

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

[Eike Rathke]

 sc/inc/refdata.hxx  |9 +++
 sc/inc/tokenarray.hxx   |6 ++
 sc/source/core/data/formulacell.cxx |3 +
 sc/source/core/tool/interpr4.cxx|1 
 sc/source/core/tool/refdata.cxx |   92 
 sc/source/core/tool/token.cxx   |   28 ++
 6 files changed, 139 insertions(+)

New commits:
commit 21d5e7bbb5ba986a3fd2b4194f83c18003fc3bac
Author: Eike Rathke 
Date:   Tue Jul 7 01:45:41 2015 +0200

always justify a referenced range in order, tdf#92468

(cherry picked from commit d24c6a0280b0287ee6c23ca89068323c6b7c3dd7)

(re-)introduce ScComplexRefData::PutInOrder(), tdf#92468

(cherry picked from commit ad3d2b6c2e88d191d76f90eb5be927f7ca76c670)

introduce ScTokenArray::AdjustReferenceOnCopy(), tdf#92468

(cherry picked from commit 369ee0b1faf79f1bd23c75ee04dd0dcc5bf283af)

call ScTokenArray::AdjustReferenceOnCopy() in ScFormulaCell clone, tdf#92468

(cherry picked from commit 3ddaeaab37d585971e376de6ad7b0f06f55f2e1a)

f551e02a77a416b95f74266de896391d1d72eb3c
0a7ac0d9d10e96223cd5f095a771aa6f9d271417
0dc0c3528b35bc6ea2525bafb94d72ee65e4791a

Change-Id: Id69c58800d28f1733777f7931a20d8ee7bdf034f
Reviewed-on: https://gerrit.libreoffice.org/16815
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/inc/refdata.hxx b/sc/inc/refdata.hxx
index c49682f..b96acb7 100644
--- a/sc/inc/refdata.hxx
+++ b/sc/inc/refdata.hxx
@@ -104,6 +104,9 @@ public:
 SCCOL Col() const;
 SCTAB Tab() const;
 
+/** Adjust ordering (front-top-left/rear-bottom-right) to a new position. 
*/
+static void PutInOrder( ScSingleRefData& rRef1, ScSingleRefData& rRef2, 
const ScAddress& rPos );
+
 bool operator==( const ScSingleRefData& ) const;
 bool operator!=( const ScSingleRefData& ) const;
 
@@ -161,8 +164,14 @@ struct ScComplexRefData
 }
 
 SC_DLLPUBLIC ScRange toAbs( const ScAddress& rPos ) const;
+
+/** Set a new range, assuming that the ordering of the range matches the
+ordering of the reference data flags already set. */
 void SetRange( const ScRange& rRange, const ScAddress& rPos );
 
+/** Adjust ordering (front-top-left/rear-bottom-right) to a new position. 
*/
+void PutInOrder( const ScAddress& rPos );
+
 inline bool operator==( const ScComplexRefData& r ) const
 { return Ref1 == r.Ref1 && Ref2 == r.Ref2; }
 /** Enlarge range if reference passed is not within existing range.
diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx
index 0d3fa02..8ed8697 100644
--- a/sc/inc/tokenarray.hxx
+++ b/sc/inc/tokenarray.hxx
@@ -217,6 +217,12 @@ public:
 void AdjustReferenceOnMovedOriginIfOtherSheet( const ScAddress& rOldPos, 
const ScAddress& rNewPos );
 
 /**
+ * Adjust internal range references on base position change to justify /
+ * put in order the relative references.
+ */
+void AdjustReferenceOnCopy( const ScAddress& rNewPos );
+
+/**
  * Clear sheet deleted flag from internal reference tokens if the sheet
  * index falls within specified range.  Note that when a reference is on a
  * sheet that's been deleted, its referenced sheet index retains the
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 24f365a..eb2b374 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -850,6 +850,9 @@ ScFormulaCell::ScFormulaCell( const ScFormulaCell& rCell, 
ScDocument& rDoc, cons
 pCode->AdjustAbsoluteRefs( rCell.pDocument, rCell.aPos, aPos, false, 
bCopyBetweenDocs );
 }
 
+if (!pDocument->IsClipOrUndo())
+pCode->AdjustReferenceOnCopy( aPos);
+
 if ( nCloneFlags & SC_CLONECELL_ADJUST3DREL )
 pCode->ReadjustRelative3DReferences( rCell.aPos, aPos );
 
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 18dee8e..9d4821c 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -1309,6 +1309,7 @@ void ScInterpreter::DoubleRefToRange( const 
ScComplexRefData & rCRef,
 rRange.aStart.Set( nCol, nRow, nTab );
 SingleRefToVars( rCRef.Ref2, nCol, nRow, nTab);
 rRange.aEnd.Set( nCol, nRow, nTab );
+rRange.Justify();
 if (! pDok->aTableOpList.empty() && !bDontCheckForTableOp )
 {
 if ( IsTableOpInRange( rRange ) )
diff --git a/sc/source/core/tool/refdata.cxx b/sc/source/core/tool/refdata.cxx
index 97d419c..4a814db 100644
--- a/sc/source/core/tool/refdata.cxx
+++ b/sc/source/core/tool/refdata.cxx
@@ -239,6 +239,93 @@ SCTAB ScSingleRefData::Tab() const
 return mnTab;
 }
 
+// static
+void ScSingleRefData::PutInOrder( ScSingleRefData& rRef1, ScSingleRefData& 
rRef2, const ScAddress& rPos )
+{
+sal_uInt8 nRelState1 = rRef1.Flags.bRelName ?
+((rRef1.Flags.bTabRel ? 4 : 0) |
+ (rRef1.Flags.bRowRel ? 2 :

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

[Eike Rathke]

 sc/inc/refdata.hxx  |9 +++
 sc/inc/tokenarray.hxx   |6 ++
 sc/source/core/data/formulacell.cxx |3 +
 sc/source/core/tool/interpr4.cxx|1 
 sc/source/core/tool/refdata.cxx |   92 
 sc/source/core/tool/token.cxx   |   27 ++
 6 files changed, 138 insertions(+)

New commits:
commit 9bb4b60fd6deb348af37d9a51860e4d554ffbc35
Author: Eike Rathke 
Date:   Tue Jul 7 01:45:41 2015 +0200

always justify a referenced range in order, tdf#92468

(cherry picked from commit d24c6a0280b0287ee6c23ca89068323c6b7c3dd7)

(re-)introduce ScComplexRefData::PutInOrder(), tdf#92468

(cherry picked from commit ad3d2b6c2e88d191d76f90eb5be927f7ca76c670)

introduce ScTokenArray::AdjustReferenceOnCopy(), tdf#92468

(cherry picked from commit 369ee0b1faf79f1bd23c75ee04dd0dcc5bf283af)

call ScTokenArray::AdjustReferenceOnCopy() in ScFormulaCell clone, tdf#92468

(cherry picked from commit 3ddaeaab37d585971e376de6ad7b0f06f55f2e1a)

f551e02a77a416b95f74266de896391d1d72eb3c
0a7ac0d9d10e96223cd5f095a771aa6f9d271417
0dc0c3528b35bc6ea2525bafb94d72ee65e4791a

Backported.

Change-Id: Id69c58800d28f1733777f7931a20d8ee7bdf034f
Reviewed-on: https://gerrit.libreoffice.org/16829
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/inc/refdata.hxx b/sc/inc/refdata.hxx
index e0d9b80..75c94a1 100644
--- a/sc/inc/refdata.hxx
+++ b/sc/inc/refdata.hxx
@@ -104,6 +104,9 @@ public:
 SCCOL Col() const;
 SCTAB Tab() const;
 
+/** Adjust ordering (front-top-left/rear-bottom-right) to a new position. 
*/
+static void PutInOrder( ScSingleRefData& rRef1, ScSingleRefData& rRef2, 
const ScAddress& rPos );
+
 bool operator==( const ScSingleRefData& ) const;
 bool operator!=( const ScSingleRefData& ) const;
 
@@ -147,8 +150,14 @@ struct ScComplexRefData
 bool ValidExternal() const;
 
 SC_DLLPUBLIC ScRange toAbs( const ScAddress& rPos ) const;
+
+/** Set a new range, assuming that the ordering of the range matches the
+ordering of the reference data flags already set. */
 void SetRange( const ScRange& rRange, const ScAddress& rPos );
 
+/** Adjust ordering (front-top-left/rear-bottom-right) to a new position. 
*/
+void PutInOrder( const ScAddress& rPos );
+
 inline bool operator==( const ScComplexRefData& r ) const
 { return Ref1 == r.Ref1 && Ref2 == r.Ref2; }
 /** Enlarge range if reference passed is not within existing range.
diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx
index cd32952..01d7a52 100644
--- a/sc/inc/tokenarray.hxx
+++ b/sc/inc/tokenarray.hxx
@@ -216,6 +216,12 @@ public:
 void AdjustReferenceOnMovedOriginIfOtherSheet( const ScAddress& rOldPos, 
const ScAddress& rNewPos );
 
 /**
+ * Adjust internal range references on base position change to justify /
+ * put in order the relative references.
+ */
+void AdjustReferenceOnCopy( const ScAddress& rNewPos );
+
+/**
  * Clear sheet deleted flag from internal reference tokens if the sheet
  * index falls within specified range.  Note that when a reference is on a
  * sheet that's been deleted, its referenced sheet index retains the
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index d456911..71b30d0 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -844,6 +844,9 @@ ScFormulaCell::ScFormulaCell( const ScFormulaCell& rCell, 
ScDocument& rDoc, cons
 pCode->AdjustAbsoluteRefs( rCell.pDocument, rCell.aPos, aPos, false, 
bCopyBetweenDocs );
 }
 
+if (!pDocument->IsClipOrUndo())
+pCode->AdjustReferenceOnCopy( aPos);
+
 if ( nCloneFlags & SC_CLONECELL_ADJUST3DREL )
 pCode->ReadjustRelative3DReferences( rCell.aPos, aPos );
 
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 504e878..f4158f0 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -1305,6 +1305,7 @@ void ScInterpreter::DoubleRefToRange( const 
ScComplexRefData & rCRef,
 rRange.aStart.Set( nCol, nRow, nTab );
 SingleRefToVars( rCRef.Ref2, nCol, nRow, nTab);
 rRange.aEnd.Set( nCol, nRow, nTab );
+rRange.Justify();
 if (! pDok->aTableOpList.empty() && !bDontCheckForTableOp )
 {
 if ( IsTableOpInRange( rRange ) )
diff --git a/sc/source/core/tool/refdata.cxx b/sc/source/core/tool/refdata.cxx
index 97d419c..4a814db 100644
--- a/sc/source/core/tool/refdata.cxx
+++ b/sc/source/core/tool/refdata.cxx
@@ -239,6 +239,93 @@ SCTAB ScSingleRefData::Tab() const
 return mnTab;
 }
 
+// static
+void ScSingleRefData::PutInOrder( ScSingleRefData& rRef1, ScSingleRefData& 
rRef2, const ScAddress& rPos )
+{
+sal_uInt8 nRelState1 = rRef1.Flags.bRelName ?
+((rRef1.Flags.bTabRel ? 4 : 0) |
+ (rR

[Libreoffice-commits] online.git: loleaflet/src

[Mihai Varga]

 loleaflet/src/layer/tile/GridLayer.js |4 ++--
 loleaflet/src/layer/tile/TileLayer.js |6 --
 2 files changed, 2 insertions(+), 8 deletions(-)

New commits:
commit 9321a7bb6dc4b8b3b1cfb3730bfd01411b4b371d
Author: Mihai Varga 
Date:   Wed Jul 8 14:45:18 2015 +0300

loleaflet: disable fade Animation as it still causes problems

diff --git a/loleaflet/src/layer/tile/GridLayer.js 
b/loleaflet/src/layer/tile/GridLayer.js
index 79875ef..b658b28 100644
--- a/loleaflet/src/layer/tile/GridLayer.js
+++ b/loleaflet/src/layer/tile/GridLayer.js
@@ -36,6 +36,7 @@ L.GridLayer = L.Layer.extend({
this._tiles = {};
this._tileCache = {};
 
+   this._map._fadeAnimated = false;
this._viewReset();
this._update();
this._map._docLayer = this;
@@ -453,7 +454,6 @@ L.GridLayer = L.Layer.extend({
},
 
_move: function () {
-   this._skipFadeAnimated = false;
this._update();
},
 
@@ -692,7 +692,7 @@ L.GridLayer = L.Layer.extend({
if (!tile) { return; }
 
tile.loaded = +new Date();
-   if (this._map._fadeAnimated && !this._skipFadeAnimated) {
+   if (this._map._fadeAnimated) {
L.DomUtil.setOpacity(tile.el, 0);
L.Util.cancelAnimFrame(this._fadeFrame);
this._fadeFrame = 
L.Util.requestAnimFrame(this._updateOpacity, this);
diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 1dbc3ce..de52184 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -423,11 +423,6 @@ L.TileLayer = L.GridLayer.extend({
key = this._tileCoordsToKey(coords);
var tile = this._tiles[key];
if (tile) {
-   if (tile.el.src) {
-   // cancel the animFade if there's any
-   L.DomUtil.setOpacity(tile.el, 1);
-   this._skipFadeAnimated = true;
-   }
if (this._tiles[key]._invalidCount > 0) {
this._tiles[key]._invalidCount -= 1;
}
@@ -1035,7 +1030,6 @@ L.TileLayer = L.GridLayer.extend({
 
_onZoom: function (e) {
if (e.type === 'zoomstart') {
-   this._skipFadeAnimated = true;
}
else if (e.type === 'zoomend') {
this._onUpdateCursor();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/source/core/data/document.cxx |   63 +++
 1 file changed, 63 insertions(+)

New commits:
commit b85ddf6ef577e7f38394a398818420fe9f367a66
Author: Eike Rathke 
Date:   Tue Jul 7 23:36:02 2015 +0200

end/restart group listening in DeleteSelection(), similar to DeleteArea()

Reproducer:
* in A1 enter =SUM(B1:C4)
* copy A1 to clipboard
* paste to A2 and A3
* formula in A2 is =SUM(B2:C5)  A3 is =SUM(B3:C6)
* select A2:A3
* hit Del key to delete the two cells
* enter any numeric value in B2
  => formula result in A1 is not updated
  Shift+Ctrl+F9 hard recalc updates

Change-Id: I55e55b8cfe69e9273170ceaea4e6c046b3d4f7b7
(cherry picked from commit a49b8af4cf03ae08cb7a28f66e24368a7b08ae3f)
Reviewed-on: https://gerrit.libreoffice.org/16838
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 4a4f0004..59fef65 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -5611,18 +5611,81 @@ void ScDocument::ClearSelectionItems( const sal_uInt16* 
pWhich, const ScMarkData
 
 void ScDocument::DeleteSelection( InsertDeleteFlags nDelFlag, const 
ScMarkData& rMark, bool bBroadcast )
 {
+sc::AutoCalcSwitch aACSwitch(*this, false);
+
+std::vector aGroupPos;
+// Destroy and reconstruct listeners only if content is affected.
+bool bDelContent = ((nDelFlag & ~IDF_CONTENTS) != nDelFlag);
+if (bDelContent)
+{
+// Record the positions of top and/or bottom formula groups that
+// intersect the area borders.
+sc::EndListeningContext aCxt(*this);
+ScRangeList aRangeList;
+rMark.FillRangeListWithMarks( &aRangeList, false);
+for (size_t i = 0; i < aRangeList.size(); ++i)
+{
+const ScRange* pRange = aRangeList[i];
+if (pRange)
+EndListeningIntersectedGroups( aCxt, *pRange, &aGroupPos);
+}
+aCxt.purgeEmptyBroadcasters();
+}
+
 SCTAB nMax = static_cast(maTabs.size());
 ScMarkData::const_iterator itr = rMark.begin(), itrEnd = rMark.end();
 for (; itr != itrEnd && *itr < nMax; ++itr)
 if (maTabs[*itr])
 maTabs[*itr]->DeleteSelection(nDelFlag, rMark, bBroadcast);
+
+if (bDelContent)
+{
+// Re-start listeners on those top bottom groups that have been split.
+SetNeedsListeningGroups(aGroupPos);
+StartNeededListeners();
+}
 }
 
 void ScDocument::DeleteSelectionTab(
 SCTAB nTab, InsertDeleteFlags nDelFlag, const ScMarkData& rMark, bool 
bBroadcast )
 {
 if (ValidTab(nTab) && nTab < static_cast(maTabs.size()) && 
maTabs[nTab])
+{
+sc::AutoCalcSwitch aACSwitch(*this, false);
+
+std::vector aGroupPos;
+// Destroy and reconstruct listeners only if content is affected.
+bool bDelContent = ((nDelFlag & ~IDF_CONTENTS) != nDelFlag);
+if (bDelContent)
+{
+// Record the positions of top and/or bottom formula groups that
+// intersect the area borders.
+sc::EndListeningContext aCxt(*this);
+ScRangeList aRangeList;
+rMark.FillRangeListWithMarks( &aRangeList, false);
+for (size_t i = 0; i < aRangeList.size(); ++i)
+{
+const ScRange* pRange = aRangeList[i];
+if (pRange && pRange->aStart.Tab() <= nTab && nTab <= 
pRange->aEnd.Tab())
+{
+ScRange aRange( *pRange);
+aRange.aStart.SetTab( nTab);
+aRange.aEnd.SetTab( nTab);
+EndListeningIntersectedGroups( aCxt, aRange, &aGroupPos);
+}
+}
+aCxt.purgeEmptyBroadcasters();
+}
+
 maTabs[nTab]->DeleteSelection(nDelFlag, rMark, bBroadcast);
+
+if (bDelContent)
+{
+// Re-start listeners on those top bottom groups that have been 
split.
+SetNeedsListeningGroups(aGroupPos);
+StartNeededListeners();
+}
+}
 else
 {
 OSL_FAIL("wrong table");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/source/core/data/document.cxx |   63 +++
 1 file changed, 63 insertions(+)

New commits:
commit d71ed0ee3fbf70c21513379184dea596b30b0baf
Author: Eike Rathke 
Date:   Tue Jul 7 23:36:02 2015 +0200

end/restart group listening in DeleteSelection(), similar to DeleteArea()

Reproducer:
* in A1 enter =SUM(B1:C4)
* copy A1 to clipboard
* paste to A2 and A3
* formula in A2 is =SUM(B2:C5)  A3 is =SUM(B3:C6)
* select A2:A3
* hit Del key to delete the two cells
* enter any numeric value in B2
  => formula result in A1 is not updated
  Shift+Ctrl+F9 hard recalc updates

Change-Id: I55e55b8cfe69e9273170ceaea4e6c046b3d4f7b7
(cherry picked from commit a49b8af4cf03ae08cb7a28f66e24368a7b08ae3f)
Reviewed-on: https://gerrit.libreoffice.org/16840
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 14ab9ac..e00a5cc 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -5646,18 +5646,81 @@ void ScDocument::ClearSelectionItems( const sal_uInt16* 
pWhich, const ScMarkData
 
 void ScDocument::DeleteSelection( InsertDeleteFlags nDelFlag, const 
ScMarkData& rMark, bool bBroadcast )
 {
+sc::AutoCalcSwitch aACSwitch(*this, false);
+
+std::vector aGroupPos;
+// Destroy and reconstruct listeners only if content is affected.
+bool bDelContent = ((nDelFlag & ~IDF_CONTENTS) != nDelFlag);
+if (bDelContent)
+{
+// Record the positions of top and/or bottom formula groups that
+// intersect the area borders.
+sc::EndListeningContext aCxt(*this);
+ScRangeList aRangeList;
+rMark.FillRangeListWithMarks( &aRangeList, false);
+for (size_t i = 0; i < aRangeList.size(); ++i)
+{
+const ScRange* pRange = aRangeList[i];
+if (pRange)
+EndListeningIntersectedGroups( aCxt, *pRange, &aGroupPos);
+}
+aCxt.purgeEmptyBroadcasters();
+}
+
 SCTAB nMax = static_cast(maTabs.size());
 ScMarkData::const_iterator itr = rMark.begin(), itrEnd = rMark.end();
 for (; itr != itrEnd && *itr < nMax; ++itr)
 if (maTabs[*itr])
 maTabs[*itr]->DeleteSelection(nDelFlag, rMark, bBroadcast);
+
+if (bDelContent)
+{
+// Re-start listeners on those top bottom groups that have been split.
+SetNeedsListeningGroups(aGroupPos);
+StartNeededListeners();
+}
 }
 
 void ScDocument::DeleteSelectionTab(
 SCTAB nTab, InsertDeleteFlags nDelFlag, const ScMarkData& rMark, bool 
bBroadcast )
 {
 if (ValidTab(nTab) && nTab < static_cast(maTabs.size()) && 
maTabs[nTab])
+{
+sc::AutoCalcSwitch aACSwitch(*this, false);
+
+std::vector aGroupPos;
+// Destroy and reconstruct listeners only if content is affected.
+bool bDelContent = ((nDelFlag & ~IDF_CONTENTS) != nDelFlag);
+if (bDelContent)
+{
+// Record the positions of top and/or bottom formula groups that
+// intersect the area borders.
+sc::EndListeningContext aCxt(*this);
+ScRangeList aRangeList;
+rMark.FillRangeListWithMarks( &aRangeList, false);
+for (size_t i = 0; i < aRangeList.size(); ++i)
+{
+const ScRange* pRange = aRangeList[i];
+if (pRange && pRange->aStart.Tab() <= nTab && nTab <= 
pRange->aEnd.Tab())
+{
+ScRange aRange( *pRange);
+aRange.aStart.SetTab( nTab);
+aRange.aEnd.SetTab( nTab);
+EndListeningIntersectedGroups( aCxt, aRange, &aGroupPos);
+}
+}
+aCxt.purgeEmptyBroadcasters();
+}
+
 maTabs[nTab]->DeleteSelection(nDelFlag, rMark, bBroadcast);
+
+if (bDelContent)
+{
+// Re-start listeners on those top bottom groups that have been 
split.
+SetNeedsListeningGroups(aGroupPos);
+StartNeededListeners();
+}
+}
 else
 {
 OSL_FAIL("wrong table");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 sw/inc/pch/precompiled_sw.hxx  |1 -
 sw/source/core/access/accmap.cxx   |3 +--
 sw/source/core/doc/docbm.cxx   |   15 +++
 sw/source/core/txtnode/fmtatr2.cxx |3 +--
 sw/source/core/unocore/unoobj2.cxx |1 -
 5 files changed, 9 insertions(+), 14 deletions(-)

New commits:
commit 056066dfdb4e4a91aa742028f6a9c06eedeaa537
Author: Michael Stahl 
Date:   Wed Jul 8 12:58:11 2015 +0200

sw: remove boost::bind from accmap.cxx

Change-Id: I9953cd58e4e285f655f11afccc1d6ee535f85d7e

diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index f14d1c9..576c721 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -43,7 +43,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index e682292..6a0883f 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -71,7 +71,6 @@
 #include 
 #include 
 #include 
-#include 
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
@@ -3092,7 +3091,7 @@ void SwAccessibleMap::FireEvents()
 mpEvents->SetFiring();
 mpEvents->MoveInvalidXAccToEnd();
 ::std::for_each(mpEvents->begin(), mpEvents->end(),
-boost::bind(&SwAccessibleMap::FireEvent, this, 
_1));
+[this] (SwAccessibleEvent_Impl const& rEvent) { 
this->FireEvent(rEvent); } );
 
 delete mpEventMap;
 mpEventMap = nullptr;
commit 1dca84e374898185851b5a90595a8b5b741431ad
Author: Michael Stahl 
Date:   Wed Jul 8 12:53:45 2015 +0200

sw: remove boost::bind from docbm.cxx

Change-Id: I3e91817c5113a391668ef0f35d6b8df4702f9715

diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 930312c..060c32f 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -19,7 +19,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -168,7 +167,7 @@ namespace
 rMarks.begin(),
 pCandidatesEnd,
 back_inserter(vCandidates),
-boost::bind( ::std::logical_not(), boost::bind( 
&IMark::EndsBefore, _1, rPos ) ) );
+[&] (IDocumentMarkAccess::pMark_t const& rpMark) { return 
!rpMark->EndsBefore(rPos); } );
 // no candidate left => we are in front of the first mark or there are 
none
 if(vCandidates.empty()) return NULL;
 // return the highest (last) candidate using mark end ordering
@@ -269,7 +268,7 @@ namespace
 return find_if(
 ppMarksBegin,
 ppMarksEnd,
-boost::bind(&OUString::equals, boost::bind(&IMark::GetName, _1), 
rName));
+[&] (IDocumentMarkAccess::pMark_t const& rpMark) { return 
rpMark->GetName() == rName; } );
 }
 
 #if 0
@@ -960,7 +959,7 @@ namespace sw { namespace mark
 find_if(
 pMarkLow,
 pMarkHigh,
-boost::bind( ::std::equal_to(), 
boost::bind(&boost::shared_ptr::get, _1), pMark ) );
+[&] (pMark_t const& rpMark) { return rpMark.get() == pMark; } 
);
 if(pMarkFound != pMarkHigh)
 deleteMark(pMarkFound);
 }
@@ -1015,8 +1014,8 @@ namespace sw { namespace mark
 {
 const_iterator_t pFieldmark = find_if(
 m_vFieldmarks.begin(),
-m_vFieldmarks.end( ),
-boost::bind(&IMark::IsCoveringPosition, _1, rPos));
+m_vFieldmarks.end(),
+[&] (pMark_t const& rpMark) { return 
rpMark->IsCoveringPosition(rPos); } );
 if(pFieldmark == m_vFieldmarks.end()) return NULL;
 return dynamic_cast(pFieldmark->get());
 }
@@ -1081,8 +1080,8 @@ namespace sw { namespace mark
 {
 const_iterator_t pAnnotationMark = find_if(
 m_vAnnotationMarks.begin(),
-m_vAnnotationMarks.end( ),
-boost::bind(&IMark::IsCoveringPosition, _1, rPos));
+m_vAnnotationMarks.end(),
+[&] (pMark_t const& rpMark) { return 
rpMark->IsCoveringPosition(rPos); } );
 if (pAnnotationMark == m_vAnnotationMarks.end())
 return NULL;
 return pAnnotationMark->get();
commit 84806f306114a038b4d5cc4eb6f34b90fbe71f9d
Author: Michael Stahl 
Date:   Wed Jul 8 12:46:37 2015 +0200

sw: remove boost::bind from fmtatr2.cxx

Change-Id: I4924251babfcea9a87e7e688c904264dd80f9359

diff --git a/sw/source/core/txtnode/fmtatr2.cxx 
b/sw/source/core/txtnode/fmtatr2.cxx
index 90a45b9..dcd698e 100644
--- a/sw/source/core/txtnode/fmtatr2.cxx
+++ b/sw/source/core/txtnode/fmtatr2.cxx
@@ -48,7 +48,6 @@
 #include 
 #include 
 
-#include 
 #include 
 
 using namespace ::com::sun::star;
@@ -811,7 +810,7 @@ MetaFieldManager::getMetaFields()
 // erase deleted fields
 const MetaFieldList_t::iterator iter(
 ::std::remove_if(m_MetaFields.begin(), m_MetaFie

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

[Miklos Vajna]

 sw/qa/extras/ooxmlexport/data/tdf89890.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |   23 +++
 sw/qa/extras/ooxmlexport/ooxmlexport4.cxx|2 +-
 writerfilter/source/dmapper/NumberingManager.cxx |   14 ++
 4 files changed, 38 insertions(+), 1 deletion(-)

New commits:
commit e3d78d605905ef23b15002a29f0f3a6de5cc12ac
Author: Miklos Vajna 
Date:   Fri Jun 26 09:02:31 2015 +0200

tdf#89890 DOCX import: fix too large num pic bullet

Reading SwWW8ImplReader::CoreLoad()'s "update graphic bullet
information" block, it turns out that the numbering picture bullet's
height should be independent from the supplied bitmap, and only its
aspect ratio should be respected.

Reviewed-on: https://gerrit.libreoffice.org/16500
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 
(cherry picked from commit eab89b7f024a8c86decdcb3362c40c40a7df37df)

Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx

Change-Id: I1300aa0397a8098df2a3170af795fbba47fd2a9e
Reviewed-on: https://gerrit.libreoffice.org/16844
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf89890.docx 
b/sw/qa/extras/ooxmlexport/data/tdf89890.docx
new file mode 100644
index 000..8b3e8eb
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf89890.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index ac4b246..2e4b8a3 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -638,6 +638,29 @@ DECLARE_OOXMLEXPORT_TEST(testTdf91261, "tdf91261.docx")
 
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf89890, "tdf89890.docx")
+{
+// Numbering picture bullet was too large.
+uno::Reference 
xPropertySet(getStyles("NumberingStyles")->getByName("WWNum1"), uno::UNO_QUERY);
+uno::Reference 
xLevels(xPropertySet->getPropertyValue("NumberingRules"), uno::UNO_QUERY);
+uno::Sequence aProps;
+xLevels->getByIndex(0) >>= aProps; // 1st level
+
+bool bFound = false;
+for (int i = 0; i < aProps.getLength(); ++i)
+{
+const beans::PropertyValue& rProp = aProps[i];
+
+if (rProp.Name == "GraphicSize")
+{
+// Height of the graphic was too large: 4382 after import, then 
2485 after roundtrip.
+CPPUNIT_ASSERT_EQUAL(static_cast(279), 
rProp.Value.get().Height);
+bFound = true;
+}
+}
+CPPUNIT_ASSERT(bFound);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
index e187959..9a495fd 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
@@ -353,7 +353,7 @@ DECLARE_OOXMLEXPORT_TEST(testFDO74215, "FDO74215.docx")
 xmlDocPtr pXmlDoc = parseExport("word/numbering.xml");
 if (!pXmlDoc)
 return;
-assertXPath(pXmlDoc, "/w:numbering/w:numPicBullet[2]/w:pict/v:shape", 
"style", "width:6.4pt;height:6.4pt");
+assertXPath(pXmlDoc, "/w:numbering/w:numPicBullet[2]/w:pict/v:shape", 
"style", "width:7.9pt;height:7.9pt");
 }
 
 DECLARE_OOXMLEXPORT_TEST(testColumnBreak_ColumnCountIsZero,"fdo74153.docx")
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx 
b/writerfilter/source/dmapper/NumberingManager.cxx
index 2412f8c..17786ea 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -877,6 +877,20 @@ void ListsManager::lcl_sprm( Sprm& rSprm )
 case NS_ooxml::LN_CT_NumPicBullet_pict:
 {
 uno::Reference xShape = 
m_rDMapper.PopPendingShape();
+
+// Respect only the aspect ratio of the picture, not its size.
+awt::Size aPrefSize = xShape->getSize();
+// See SwDefBulletConfig::InitFont(), default height is 14.
+const int nFontHeight = 14;
+// Point -> mm100.
+const int nHeight = nFontHeight * 35;
+if (aPrefSize.Height * aPrefSize.Width != 0)
+{
+int nWidth = (nHeight * aPrefSize.Width) / 
aPrefSize.Height;
+awt::Size aSize(nWidth, nHeight);
+xShape->setSize(aSize);
+}
+
 m_pCurrentNumPicBullet->SetShape(xShape);
 }
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 38885] Remove CreateTextFromNode methods

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=38885

--- Comment #7 from Regina Henschel  ---
I think, that it should be a long time goal to switch from StarMath to MathML.
But as long as there exists no direct editing of MathML, it is too early to
remove generating StarMath source.

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

[Caolán McNamara]

 sd/source/ui/app/sdmod2.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 737e392537d909f7915fb071230cc59ee1ff51e6
Author: Caolán McNamara 
Date:   Wed Jul 8 11:02:08 2015 +0100

fix crash on loading presentation with page name field

regression from

commit 42b521f800a08b11432cf906ce1bdf9fcbfffdeb
Date:   Wed Apr 22 23:31:43 2015 +0200

tdf#88056: Implement ODF import/export of page title field

Change-Id: I577a7c52836bbb13cc93910b4458aee5482ffc86

diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index 35ff9ce..a69beb8 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -270,7 +270,8 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, 
pInfo)
 }
 else
 {
-aRepresentation = ( ( pDoc->GetDocumentType() == 
DOCUMENT_TYPE_IMPRESS )
+DocumentType eDocType = pDoc ? pDoc->GetDocumentType() : 
DOCUMENT_TYPE_IMPRESS;
+aRepresentation = ( ( eDocType == DOCUMENT_TYPE_IMPRESS )
 ? 
SdResId(STR_FIELD_PLACEHOLDER_SLIDENAME).toString()
 : 
SdResId(STR_FIELD_PLACEHOLDER_PAGENAME).toString() );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 4 commits - registry/inc reportbuilder/java sal/osl sal/qa sc/qa scripting/source sc/source sdext/README sdext/source sd/source sfx2/source shell/source slideshow/qa so

[Michael Stahl]

 registry/inc/regapi.hxx
  |2 -
 
reportbuilder/java/org/libreoffice/report/pentaho/output/text/MasterPageFactory.java
 |2 -
 sal/osl/unx/file_misc.cxx  
  |2 -
 sal/osl/w32/file_dirvol.cxx
  |2 -
 sal/qa/OStringBuffer/rtl_OStringBuffer.cxx 
  |4 +-
 sc/qa/unit/filters-test.cxx
  |4 +-
 sc/qa/unit/ucalc_pivottable.cxx
  |2 -
 sc/source/filter/inc/xestyle.hxx   
  |2 -
 sc/source/ui/Accessibility/AccessiblePageHeader.cxx
  |2 -
 sc/source/ui/inc/inputhdl.hxx  
  |2 -
 sc/source/ui/vba/vbaborders.cxx
  |2 -
 sc/source/ui/vba/vbarange.cxx  
  |2 -
 sc/source/ui/view/cellsh1.cxx  
  |2 -
 scripting/source/provider/MasterScriptProvider.cxx 
  |2 -
 sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx 
  |2 -
 sdext/README   
  |2 -
 sdext/source/presenter/PresenterAccessibility.cxx  
  |2 -
 sfx2/source/dialog/splitwin.cxx
  |4 +-
 sfx2/source/view/frame.cxx 
  |2 -
 shell/source/tools/lngconvex/lngconvex.cxx 
  |2 -
 slideshow/qa/tools/mkeffects.pl
  |2 -
 slideshow/qa/tools/mktransitions.pl
  |2 -
 solenv/gbuild/platform/filter-showIncludes.awk 
  |2 -
 sot/source/sdstor/stgelem.hxx  
  |2 -
 stoc/source/javavm/javavm.cxx  
  |4 +-
 svtools/source/config/printoptions.cxx 
  |2 -
 svtools/source/control/ctrltool.cxx
  |2 -
 svtools/source/misc/langtab.cxx
  |2 -
 svtools/source/table/tablecontrol.cxx  
  |2 -
 svx/source/dialog/charmap.cxx  
  |4 +-
 svx/source/engine3d/view3d.cxx 
  |2 -
 svx/source/form/filtnav.cxx
  |2 -
 svx/source/sdr/contact/viewcontactofpageobj.cxx
  |2 -
 svx/source/sdr/contact/viewcontactofsdrpathobj.cxx 
  |2 -
 svx/source/xml/xmlgrhlp.cxx
  |2 -
 sw/inc/doc.hxx 
  |2 -
 sw/source/core/crsr/findtxt.cxx
  |2 -
 sw/source/core/doc/DocumentChartDataProviderManager.cxx
  |2 -
 sw/source/core/doc/DocumentContentOperationsManager.cxx
  |   20 +-
 sw/source/core/text/inftxt.hxx 
  |2 -
 sw/source/core/text/itrpaint.cxx   
  |2 -
 sw/source/core/text/portxt.cxx 
  |2 -
 sw/source/core/unocore/unostyle.cxx
  |4 +-
 sw/source/core/view/viewsh.cxx 
  |2 -
 sw/source/filter/ww8/docxattributeoutput.cxx   
  |2 -
 sw/source/filter/ww8/wrtw8nds.cxx  
  |6 +--
 sw/source/filter/xml/swxml.cxx 
  |2 -
 sw/source/ui/vba/vbaborders.cxx
  |2 -
 ucb/source/cacher/dynamicresultsetwrapper.cxx  
  |2 -
 ucb/source/sorter/sortdynres.cxx   
  |2 -
 ucb/source/ucp/cmis/cmis_content.cxx   
  |2 -
 unoxml/source/dom/document.cxx 

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

[Adolfo Jayme Barrientos]

 icon-themes/galaxy/sfx2/res/logo.png |binary
 1 file changed

New commits:
commit 9bb825704b7592cfc66267303cb019e38dcb3c2d
Author: Adolfo Jayme Barrientos 
Date:   Wed Jul 8 05:12:02 2015 -0500

tdf#90452 StartCenter: Replace old, clunky, non-transparent LO logo…

… with something more elegant and sophisticated.

Change-Id: Ie9cba3a0bc576c42279e7a46e24576b44a2e049a

diff --git a/icon-themes/galaxy/sfx2/res/logo.png 
b/icon-themes/galaxy/sfx2/res/logo.png
index d5f2c25..0678afb 100644
Binary files a/icon-themes/galaxy/sfx2/res/logo.png and 
b/icon-themes/galaxy/sfx2/res/logo.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Katarina Behrens]

 include/vcl/print.hxx  |2 +-
 include/vcl/printerinfomanager.hxx |1 +
 vcl/generic/print/genprnpsp.cxx|1 +
 vcl/generic/print/prtsetup.cxx |8 
 vcl/inc/jobset.h   |1 +
 vcl/source/gdi/jobset.cxx  |2 ++
 vcl/source/gdi/print.cxx   |6 --
 vcl/source/gdi/print3.cxx  |2 +-
 8 files changed, 19 insertions(+), 4 deletions(-)

New commits:
commit 6779b46796c93cbb4293a400f57c29e8ae85811b
Author: Katarina Behrens 
Date:   Tue Jul 7 12:08:33 2015 +0200

Related tdf#91362: disable paper size & orientation selection

Unless 'Use only papersize from printer prefs' is toggled on,
whatever the user sets here doesn't have any effect on the actual
printing (page settings from the document are used instead). It is
misleading to have the user believe otherwise.

It was really challenging to have this one toggle get all the way
down through several layers of abstraction, though ...

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

diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index 35c6109..d0ec6a1 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -320,7 +320,7 @@ public:
 boolSetJobSetup( const JobSetup& rSetup );
 const JobSetup& GetJobSetup() const { return maJobSetup; }
 
-boolSetup( vcl::Window* pWindow = NULL );
+boolSetup( vcl::Window* pWindow = NULL, bool 
bPapersizeFromSetup = false );
 boolSetPrinterProps( const Printer* pPrinter );
 
 // SetPrinterOptions is used internally only now
diff --git a/include/vcl/printerinfomanager.hxx 
b/include/vcl/printerinfomanager.hxx
index ec5c587..52245c4 100644
--- a/include/vcl/printerinfomanager.hxx
+++ b/include/vcl/printerinfomanager.hxx
@@ -50,6 +50,7 @@ struct PrinterInfo : JobData
 // a list of special features separated by ',' not used by psprint
 // but assigned from the outside (currently for 
"fax","pdf=","autoqueue","external_dialog")
 OUString m_aFeatures;
+bool m_bPapersizeFromSetup;
 
 PrinterInfo() :
 JobData()
diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index 425b717..6f4a907 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -560,6 +560,7 @@ bool PspSalInfoPrinter::Setup( SalFrame* pFrame, 
ImplJobSetup* pJobSetup )
 SetData( ~0, pJobSetup );
 JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, 
pJobSetup->mnDriverDataLen, aInfo );
 }
+aInfo.m_bPapersizeFromSetup = pJobSetup->mbPapersizeFromSetup;
 
 if (SetupPrinterDriver(aInfo))
 {
diff --git a/vcl/generic/print/prtsetup.cxx b/vcl/generic/print/prtsetup.cxx
index 41fd69c..8a5fd70 100644
--- a/vcl/generic/print/prtsetup.cxx
+++ b/vcl/generic/print/prtsetup.cxx
@@ -256,6 +256,14 @@ void RTSPaperPage::update()
 m_pSlotText->Enable( false );
 m_pSlotBox->Enable( false );
 }
+
+// disable those, unless user wants to use papersize from printer prefs
+// as they have no influence on what's going to be printed anyway
+if (!m_pParent->m_aJobData.m_bPapersizeFromSetup)
+{
+m_pPaperBox->Enable( false );
+m_pOrientBox->Enable( false );
+}
 }
 
 IMPL_LINK( RTSPaperPage, SelectHdl, ListBox*, pBox )
diff --git a/vcl/inc/jobset.h b/vcl/inc/jobset.h
index 9ce9c5c..f0bf8a5 100644
--- a/vcl/inc/jobset.h
+++ b/vcl/inc/jobset.h
@@ -43,6 +43,7 @@ struct ImplJobSetup
 longmnPaperHeight;  // paper height (100th mm)
 sal_uIntPtr mnDriverDataLen;// length of system specific data
 sal_uInt8*  mpDriverData;   // system specific data (will be 
streamed a byte block)
+boolmbPapersizeFromSetup;
 std::unordered_map< OUString, OUString, OUStringHash > maValueMap;
 
 ImplJobSetup();
diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index 623d7be..ab6d0cd 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -61,6 +61,7 @@ ImplJobSetup::ImplJobSetup()
 mnPaperHeight   = 0;
 mnDriverDataLen = 0;
 mpDriverData= NULL;
+mbPapersizeFromSetup = false;
 }
 
 ImplJobSetup::ImplJobSetup( const ImplJobSetup& rJobSetup ) :
@@ -83,6 +84,7 @@ ImplJobSetup::ImplJobSetup( const ImplJobSetup& rJobSetup ) :
 }
 else
 mpDriverData = NULL;
+mbPapersizeFromSetup = rJobSetup.mbPapersizeFromSetup;
 maValueMap  = rJobSetup.maValueMap;
 }
 
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index b920cea..c01d6a3 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -1133,7 +1133,7 @@ bool Printe

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.4' - 18 commits - cppcanvas/source dbaccess/source filter/source icon-themes/sifr include/oox include/svx include/unotools oox/source read

[Christian Lohmaier]

 cppcanvas/source/mtfrenderer/emfplus.cxx |2 
 dbaccess/source/ui/app/AppController.cxx |2 
 filter/source/graphicfilter/ipsd/ipsd.cxx|   47 
 icon-themes/sifr/sw/res/doublepage_10x22.png |binary
 icon-themes/sifr/sw/res/emptypage_10x14.png  |binary
 icon-themes/sifr/sw/res/twopages_10x24.png   |binary
 include/oox/vml/vmlshape.hxx |1 
 include/oox/vml/vmltextbox.hxx   |1 
 include/svx/svdpagv.hxx  |5 
 include/unotools/historyoptions.hxx  |3 
 oox/source/vml/vmlshape.cxx  |   77 
 oox/source/vml/vmlshapecontext.cxx   |1 
 oox/source/vml/vmltextboxcontext.cxx |2 
 readlicense_oo/license/CREDITS.fodt  | 2885 +++
 sc/source/ui/Accessibility/AccessibleDocument.cxx|3 
 sc/source/ui/Accessibility/AccessibleEditObject.cxx  |   12 
 sc/source/ui/cctrl/tbinsert.cxx  |2 
 sc/source/ui/inc/tbinsert.hxx|4 
 sd/source/ui/func/fusel.cxx  |9 
 sd/source/ui/func/futext.cxx |9 
 sdext/source/pdfimport/tree/drawtreevisiting.cxx |   85 
 sdext/source/pdfimport/tree/pdfiprocessor.cxx|   88 
 sfx2/source/appl/newhelp.cxx |2 
 sfx2/source/appl/sfxpicklist.cxx |   35 
 svx/source/sdr/contact/viewobjectcontactofgraphic.cxx|   21 
 svx/source/svdraw/svdmrkv.cxx|   51 
 sw/qa/extras/ooxmlimport/data/tdf87460.docx  |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |   13 
 sw/qa/extras/ww8export/data/tdf92281.doc |binary
 sw/qa/extras/ww8export/ww8export.cxx |8 
 sw/source/filter/ww8/ww8par6.cxx |2 
 sw/source/uibase/app/docsh.cxx   |6 
 tools/source/zcodec/zcodec.cxx   |6 
 unotools/source/config/historyoptions.cxx|   17 
 vcl/source/control/ilstbox.cxx   |   10 
 vcl/unx/gtk/window/gtksalframe.cxx   |   12 
 writerfilter/CppunitTest_writerfilter_misc.mk|1 
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |   12 
 writerfilter/source/dmapper/DomainMapperTableHandler.hxx |4 
 writerfilter/source/dmapper/DomainMapper_Impl.cxx|  180 
 writerfilter/source/dmapper/DomainMapper_Impl.hxx|3 
 writerfilter/source/dmapper/GraphicImport.cxx|8 
 42 files changed, 1912 insertions(+), 1717 deletions(-)

New commits:
commit 929f83d5152a38c72ceda7f6f85bf331040b6f19
Author: Christian Lohmaier 
Date:   Wed Jul 8 00:12:47 2015 +0200

update credits

Change-Id: I05b92ee50757165652710b0ed4e3c7d09264dd3b

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 77d3069..616d1e7 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,24 +1,24 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-t

[Libreoffice-commits] help.git: Branch 'distro/collabora/cp-4.4' - source/text

[Andras Timar]

 source/text/shared/guide/startcenter.xhp |   27 +--
 1 file changed, 13 insertions(+), 14 deletions(-)

New commits:
commit 74016cc893deb4b5b68d19c4fd209f8f9a68dc03
Author: Andras Timar 
Date:   Tue Jul 7 14:52:38 2015 +0200

tdf#86301 fix hids of startcenter

(cherry picked from commit 5aad108719014b52c9aba6be407ed553d0095a66)

Conflicts:
source/text/shared/guide/startcenter.xhp

Change-Id: Ic33ff7519d820d9d770db6a3d2d067a81fb38272
Reviewed-on: https://gerrit.libreoffice.org/16818
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/source/text/shared/guide/startcenter.xhp 
b/source/text/shared/guide/startcenter.xhp
index 2544df5..1ff0f96 100644
--- a/source/text/shared/guide/startcenter.xhp
+++ b/source/text/shared/guide/startcenter.xhp
@@ -31,10 +31,10 @@
   start center
 
 
-
-
-
-
+
+
+
+
 Start Center
 
 Welcome to %PRODUCTNAME.
@@ -43,14 +43,13 @@
 You see the Start Center when no document is open in %PRODUCTNAME.
   It is divided into two panes.  Click an icon on the left pane 
to open a new document or a file dialog.
 
-
-
-
-
-
-
-The document icons each open a new document
-of the specified type.
+
+
+
+
+
+
+The document icons each open a new document of the 
specified type.
   
  
 
@@ -77,10 +76,10 @@
Formula opens %PRODUCTNAME Math
  
   
-
+
 The Templates icon opens the 
Templates and Documents dialog.
 The Templates icon opens the Templates and Documents 
dialog.
-
+
 The Open a Document icon presents 
a file open dialog.
 The Open a document icon presents a file open 
dialog.the four icons show a short explanation 
already
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.4' - helpcontent2

[Andras Timar]

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

New commits:
commit b9e717d769cc930364b9536b1c3d437890bb7e8d
Author: Andras Timar 
Date:   Tue Jul 7 14:52:38 2015 +0200

Updated core
Project: help  74016cc893deb4b5b68d19c4fd209f8f9a68dc03

tdf#86301 fix hids of startcenter

(cherry picked from commit 5aad108719014b52c9aba6be407ed553d0095a66)

Conflicts:
source/text/shared/guide/startcenter.xhp

Change-Id: Ic33ff7519d820d9d770db6a3d2d067a81fb38272
Reviewed-on: https://gerrit.libreoffice.org/16818
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index 40967ad..74016cc 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 40967add67da1353dae0f1f9cc31475f4650381c
+Subproject commit 74016cc893deb4b5b68d19c4fd209f8f9a68dc03
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 basegfx/source/polygon/b3dpolygon.cxx|  114 +--
 basegfx/source/polygon/b3dpolypolygon.cxx|8 
 chart2/source/model/template/AreaChartTypeTemplate.cxx   |2 
 chart2/source/model/template/BarChartTypeTemplate.cxx|2 
 chart2/source/model/template/BubbleChartTypeTemplate.cxx |2 
 chart2/source/model/template/ChartTypeTemplate.cxx   |2 
 chart2/source/model/template/ChartTypeTemplate.hxx   |2 
 chart2/source/model/template/ColumnLineChartTypeTemplate.cxx |4 
 chart2/source/model/template/LineChartTypeTemplate.cxx   |2 
 chart2/source/model/template/NetChartTypeTemplate.cxx|2 
 chart2/source/model/template/PieChartTypeTemplate.cxx|2 
 chart2/source/model/template/ScatterChartTypeTemplate.cxx|2 
 chart2/source/model/template/StockChartTypeTemplate.cxx  |2 
 drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx   |2 
 drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx  |2 
 drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx   |2 
 drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx|8 
 drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx  |8 
 drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx |2 
 include/basegfx/polygon/b3dpolygon.hxx   |2 
 include/basegfx/polygon/b3dpolypolygon.hxx   |2 
 21 files changed, 87 insertions(+), 87 deletions(-)

New commits:
commit 93e7870f31065ceda3485cb9390374d240587a78
Author: Tor Lillqvist 
Date:   Wed Jul 8 11:43:35 2015 +0300

s/Coordiante/Coordinate

Change-Id: Iac584b09844b5877586061e9a44b1f7473bffed4

diff --git a/basegfx/source/polygon/b3dpolygon.cxx 
b/basegfx/source/polygon/b3dpolygon.cxx
index 3458770..020b6c6 100644
--- a/basegfx/source/polygon/b3dpolygon.cxx
+++ b/basegfx/source/polygon/b3dpolygon.cxx
@@ -753,7 +753,7 @@ class ImplB3DPolygon
 
 // The TextureCoordinates vector. This vectors are created on demand
 // and may be zero.
-TextureCoordinate2D*mpTextureCoordiantes;
+TextureCoordinate2D*mpTextureCoordinates;
 
 // The calculated plane normal. mbPlaneNormalValid says if it's valid.
 ::basegfx::B3DVectormaPlaneNormal;
@@ -781,7 +781,7 @@ public:
 :   maPoints(0L),
 mpBColors(0L),
 mpNormals(0L),
-mpTextureCoordiantes(0L),
+mpTextureCoordinates(0L),
 maPlaneNormal(::basegfx::B3DVector::getEmptyVector()),
 mbIsClosed(false),
 mbPlaneNormalValid(true)
@@ -793,7 +793,7 @@ public:
 :   maPoints(rToBeCopied.maPoints),
 mpBColors(0L),
 mpNormals(0L),
-mpTextureCoordiantes(0L),
+mpTextureCoordinates(0L),
 maPlaneNormal(rToBeCopied.maPlaneNormal),
 mbIsClosed(rToBeCopied.mbIsClosed),
 mbPlaneNormalValid(rToBeCopied.mbPlaneNormalValid)
@@ -809,9 +809,9 @@ public:
 mpNormals = new NormalsArray3D(*rToBeCopied.mpNormals);
 }
 
-if(rToBeCopied.mpTextureCoordiantes && 
rToBeCopied.mpTextureCoordiantes->isUsed())
+if(rToBeCopied.mpTextureCoordinates && 
rToBeCopied.mpTextureCoordinates->isUsed())
 {
-mpTextureCoordiantes = new 
TextureCoordinate2D(*rToBeCopied.mpTextureCoordiantes);
+mpTextureCoordinates = new 
TextureCoordinate2D(*rToBeCopied.mpTextureCoordinates);
 }
 }
 
@@ -819,7 +819,7 @@ public:
 :   maPoints(rToBeCopied.maPoints, nIndex, nCount),
 mpBColors(0L),
 mpNormals(0L),
-mpTextureCoordiantes(0L),
+mpTextureCoordinates(0L),
 maPlaneNormal(::basegfx::B3DVector::getEmptyVector()),
 mbIsClosed(rToBeCopied.mbIsClosed),
 mbPlaneNormalValid(false)
@@ -847,14 +847,14 @@ public:
 }
 }
 
-if(rToBeCopied.mpTextureCoordiantes && 
rToBeCopied.mpTextureCoordiantes->isUsed())
+if(rToBeCopied.mpTextureCoordinates && 
rToBeCopied.mpTextureCoordinates->isUsed())
 {
-mpTextureCoordiantes = new 
TextureCoordinate2D(*rToBeCopied.mpTextureCoordiantes, nIndex, nCount);
+mpTextureCoordinates = new 
TextureCoordinate2D(*rToBeCopied.mpTextureCoordinates, nIndex, nCount);
 
-if(!mpTextureCoordiantes->isUsed())
+if(!mpTextureCoordinates->isUsed())
 {
-delete mpTextureCoordiantes;
-mpTextureCoordiantes = 0L;
+delete mpTextureCoordinates;
+mpTextureCoordinates = 0L;
 }
 }
 }
@@ -873,10 +873,10 @@ public:
 mpNormals = 0L;
 }
 
-if(mpTextureCoordiantes)
+if(mpTextureCoordinates)
 {
-delete mpTextureCoordiantes;
-mpTextureCoordiantes = 0L;
+delete mpTextureCoordinates;
+   

[Libreoffice-commits] core.git: 5 commits - sc/inc sc/source sd/qa sd/source sw/source

[Michael Stahl]

 sc/inc/pch/precompiled_sc.hxx  |1 -
 sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx |2 --
 sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx |4 +---
 sc/source/ui/StatisticsDialogs/FTestDialog.cxx |6 ++
 sc/source/ui/StatisticsDialogs/TTestDialog.cxx |6 ++
 sc/source/ui/StatisticsDialogs/ZTestDialog.cxx |6 ++
 sd/qa/unit/export-tests.cxx|2 +-
 sd/source/core/stlsheet.cxx|7 +++
 sw/source/uibase/sidebar/PagePropertyPanel.cxx |   10 
--
 sw/source/uibase/sidebar/SwPanelFactory.cxx|1 -
 10 files changed, 19 insertions(+), 26 deletions(-)

New commits:
commit 5f3930edf853003fa57130b0a7d0a92059f94dc7
Author: Michael Stahl 
Date:   Tue Jul 7 22:12:51 2015 +0200

sw: remove boost::bind from PagePropertyPanel

Change-Id: I4e5bb81a14ee996bddc8585b5d350487f5f20d50

diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.cxx 
b/sw/source/uibase/sidebar/PagePropertyPanel.cxx
index 0d0ac10..4300404 100644
--- a/sw/source/uibase/sidebar/PagePropertyPanel.cxx
+++ b/sw/source/uibase/sidebar/PagePropertyPanel.cxx
@@ -48,8 +48,6 @@
 #include 
 #include 
 
-#include 
-
 #include 
 #include 
 #include 
@@ -171,16 +169,16 @@ PagePropertyPanel::PagePropertyPanel(
 , m_aSwPagePgMetricControl(SID_ATTR_METRIC, *pBindings, *this)
 
 , maOrientationPopup( this,
-  ::boost::bind( 
&PagePropertyPanel::CreatePageOrientationControl, this, _1 ),
+[this] (svx::sidebar::PopupContainer *parent)  { return 
this->CreatePageOrientationControl(parent); },
   OUString("Page orientation") )
 , maMarginPopup( this,
- ::boost::bind( 
&PagePropertyPanel::CreatePageMarginControl, this, _1 ),
+[this] (svx::sidebar::PopupContainer *parent) { return 
this->CreatePageMarginControl(parent); },
  OUString("Page margins") )
 , maSizePopup( this,
-   ::boost::bind( &PagePropertyPanel::CreatePageSizeControl, 
this, _1 ),
+[this] (svx::sidebar::PopupContainer *parent) { return 
this->CreatePageSizeControl(parent); },
OUString("Page size") )
 , maColumnPopup( this,
- ::boost::bind( 
&PagePropertyPanel::CreatePageColumnControl, this, _1 ),
+[this] (svx::sidebar::PopupContainer *parent) { return 
this->CreatePageColumnControl(parent); },
  OUString("Page columns") )
 
 , mxUndoManager( getUndoManager( rxFrame ) )
diff --git a/sw/source/uibase/sidebar/SwPanelFactory.cxx 
b/sw/source/uibase/sidebar/SwPanelFactory.cxx
index 92dd487..ae6feab 100644
--- a/sw/source/uibase/sidebar/SwPanelFactory.cxx
+++ b/sw/source/uibase/sidebar/SwPanelFactory.cxx
@@ -37,7 +37,6 @@
 #include 
 #include 
 
-#include 
 #include 
 
 using namespace css;
commit 177f59b9e0ebdbde1d13d0c18d57e215287eafbf
Author: Michael Stahl 
Date:   Tue Jul 7 17:49:21 2015 +0200

sc: convert boost::scoped_ptr to std::unique_ptr while there

Change-Id: I5c03889f3611b7c1799c39aa75a223ba34b603e4

diff --git a/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx 
b/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx
index 36ed5fe..1759c71 100644
--- a/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx
@@ -11,7 +11,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include "formulacell.hxx"
 #include "rangelst.hxx"
diff --git a/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx 
b/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
index 4f935c0..0701b2e 100644
--- a/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
@@ -11,7 +11,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include "formulacell.hxx"
 #include "rangelst.hxx"
@@ -87,7 +86,7 @@ ScRange 
ScDescriptiveStatisticsDialog::ApplyOutput(ScDocShell* pDocShell)
 formula::FormulaGrammar::mergeToGrammar( 
formula::FormulaGrammar::GRAM_ENGLISH, mAddressDetails.eConv));
 FormulaTemplate aTemplate(mDocument);
 
-boost::scoped_ptr pIterator;
+std::unique_ptr pIterator;
 if (mGroupedBy == BY_COLUMN)
 pIterator.reset(new DataRangeByColumnIterator(mInputRange));
 else
diff --git a/sc/source/ui/StatisticsDialogs/FTestDialog.cxx 
b/sc/source/ui/StatisticsDialogs/FTestDialog.cxx
index a23699d..c2e68e8 100644
--- a/sc/source/ui/StatisticsDialogs/FTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/FTestDialog.cxx
@@ -11,7 +11,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include "formulacell.hxx"
 #include "rangelst.hxx"
@@ -56,13 +55,13 @@ ScRange ScFTestDialog::ApplyOutput(ScDocShell* pDocShell)
 
form

Heiher license statement

[Heiher]

All of my past & future contributions to LibreOffice may be
licensed under the MPLv2/LGPLv3+ dual license.

-- 
Best regards!
Heiher
http://hev.cc
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Caolán McNamara]

 include/sfx2/childwin.hxx |2 ++
 sfx2/source/appl/childwin.cxx |   17 +++--
 2 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit a26723f028a9795104e12b5f98cddb53471b44d2
Author: Caolán McNamara 
Date:   Tue Jul 7 13:47:14 2015 +0100

Related: tdf#92392 clear workwins that point to pWindow

before trying to destroy pWindow

Change-Id: I7257096e8da2a5d6753ad2091287d63ea9ae244b
(cherry picked from commit 3c6eec0d99a2bb84bd6719ad498d5de54dc959fe)
Reviewed-on: https://gerrit.libreoffice.org/16832
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx
index eb43f8e..7214005 100644
--- a/include/sfx2/childwin.hxx
+++ b/include/sfx2/childwin.hxx
@@ -163,6 +163,8 @@ private:
 GetContext() const
 { return pContext; }
 
+SAL_DLLPRIVATE void ClearWorkwin();
+
 protected:
 SfxChildWindow(vcl::Window *pParentWindow, sal_uInt16 
nId);
 
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index 0b41d43..35e53d6 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -177,12 +177,7 @@ void SfxChildWindow::Destroy()
 {
 if ( GetFrame().is() )
 {
-if (pImp->pWorkWin)
-{
-if (pImp->pWorkWin->GetActiveChild_Impl() == pWindow)
-pImp->pWorkWin->SetActiveChild_Impl(NULL);
-pImp->pWorkWin = NULL;
-}
+ClearWorkwin();
 try
 {
 ::com::sun::star::uno::Reference < 
::com::sun::star::util::XCloseable > xClose( GetFrame(), 
::com::sun::star::uno::UNO_QUERY );
@@ -199,11 +194,21 @@ void SfxChildWindow::Destroy()
 delete this;
 }
 
+void SfxChildWindow::ClearWorkwin()
+{
+if (pImp->pWorkWin)
+{
+if (pImp->pWorkWin->GetActiveChild_Impl() == pWindow)
+pImp->pWorkWin->SetActiveChild_Impl(NULL);
+pImp->pWorkWin = NULL;
+}
+}
 
 SfxChildWindow::~SfxChildWindow()
 {
 delete pContext;
 pContext = NULL;
+ClearWorkwin();
 pWindow.disposeAndClear();
 delete pImp;
 pImp = NULL;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sc/source/ui/miscdlgs/anyrefdg.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit f932f1197e1cabd901231223dc9c7ce9c171120e
Author: Caolán McNamara 
Date:   Tue Jul 7 13:46:41 2015 +0100

Related: tdf#92392 clear some more vclptrs on dispose

Change-Id: I91b8d082ff19328e35e2f1c2a02838d96224dc9c
(cherry picked from commit 8e20a25319e16d2f74e18696480556bc841a1679)
Reviewed-on: https://gerrit.libreoffice.org/16831
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx 
b/sc/source/ui/miscdlgs/anyrefdg.cxx
index 6208048..870692c 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -83,6 +83,11 @@ void ScFormulaReferenceHelper::dispose()
 pInputHdl->ResetDelayTimer();   // stop the timer for disabling the 
input line
 
 pAccel.reset();
+
+mpOldEditParent.clear();
+m_pWindow.clear();
+pRefBtn.clear();
+pRefEdit.clear();
 }
 
 void ScFormulaReferenceHelper::enableInput( bool bEnable )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 qadevOOo/runner/helper/OfficeProvider.java |2 +-
 qadevOOo/tests/java/ifc/text/_XText.java   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1302fbe6a1872e3234dee3902079970d8672db92
Author: Andras Timar 
Date:   Wed Jul 8 10:34:12 2015 +0200

typo: contest -> content

Change-Id: If7fa4672ef76082526f4dd3e6090a19d7f9687b3

diff --git a/qadevOOo/runner/helper/OfficeProvider.java 
b/qadevOOo/runner/helper/OfficeProvider.java
index 7318144..ed99b7d 100644
--- a/qadevOOo/runner/helper/OfficeProvider.java
+++ b/qadevOOo/runner/helper/OfficeProvider.java
@@ -655,7 +655,7 @@ public class OfficeProvider implements AppProvider
 /**
  * If the office is connected but the AppExecutionCommand is 
not set,
  * this function asks the office for its location and fill the
- * AppExecutionCommand with valid contest.
+ * AppExecutionCommand with valid content.
  * This function was only called if parameter AutoRestart is 
set.
  * @param msf the MultiServiceFactory
  * @param param the TestParameters
diff --git a/qadevOOo/tests/java/ifc/text/_XText.java 
b/qadevOOo/tests/java/ifc/text/_XText.java
index eb1df0c..234dd5f 100644
--- a/qadevOOo/tests/java/ifc/text/_XText.java
+++ b/qadevOOo/tests/java/ifc/text/_XText.java
@@ -124,7 +124,7 @@ public class _XText extends MultiMethodTest {
 
 
 /**
- * Removes the text contest added before. 
+ * Removes the text content added before. 
  * Has  OK  status if the method successfully returns
  * and no exceptions were thrown. 
  * The following method tests are to be completed successfully before :
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |   25 +
 1 file changed, 9 insertions(+), 16 deletions(-)

New commits:
commit e7a6b023e3354713ec584321e849e575ab310cb9
Author: Caolán McNamara 
Date:   Wed Jul 8 09:11:03 2015 +0100

gtk3: rework to remove gtk_style_context_set_path warning

Change-Id: I5d09d460e145bc3dc04d0cdd27bc4a1094053669

diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 98ad9b1..9fa1f7e 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -1971,8 +1971,6 @@ GtkSalGraphics::GtkSalGraphics( GtkSalFrame *pFrame, 
GtkWidget *pWindow )
 if(style_loaded)
 return;
 
-GtkWidgetPath* path;
-
 style_loaded = true;
 gtk_init(NULL, NULL);
 /* Load the GtkStyleContexts, it might be a bit slow, but usually,
@@ -1989,24 +1987,19 @@ GtkSalGraphics::GtkSalGraphics( GtkSalFrame *pFrame, 
GtkWidget *pWindow )
 getStyleContext(&mpTextViewStyle, gtk_text_view_new());
 getStyleContext(&mpButtonStyle, gtk_button_new());
 
-getStyleContext(&mpToolbarStyle, gtk_toolbar_new());
+GtkWidget* pToolbar = gtk_toolbar_new();
+mpToolbarStyle = gtk_widget_get_style_context(pToolbar);
 gtk_style_context_add_class(mpToolbarStyle, 
GTK_STYLE_CLASS_PRIMARY_TOOLBAR);
 gtk_style_context_add_class(mpToolbarStyle, GTK_STYLE_CLASS_TOOLBAR);
 
-getStyleContext(&mpToolbarSeperatorStyle, 
GTK_WIDGET(gtk_separator_tool_item_new()));
-
-getStyleContext(&mpToolButtonStyle, gtk_button_new());
+GtkToolItem *item = gtk_separator_tool_item_new();
+gtk_toolbar_insert(GTK_TOOLBAR(pToolbar), item, -1);
+mpToolbarSeperatorStyle = gtk_widget_get_style_context(GTK_WIDGET(item));
 
-/* Create a widget path for our toolbutton widget */
-path = gtk_widget_path_new();
-gtk_widget_path_append_type(path, GTK_TYPE_TOOLBAR);
-gtk_widget_path_append_type(path, GTK_TYPE_TOOL_BUTTON);
-gtk_widget_path_append_type(path, GTK_TYPE_BUTTON);
-gtk_widget_path_iter_add_class (path, 0, GTK_STYLE_CLASS_PRIMARY_TOOLBAR);
-gtk_widget_path_iter_add_class (path, 1, GTK_STYLE_CLASS_TOOLBAR);
-gtk_widget_path_iter_add_class (path, 2, GTK_STYLE_CLASS_BUTTON);
-gtk_style_context_set_path(mpToolButtonStyle, path);
-gtk_widget_path_free (path);
+GtkWidget *pButton = gtk_button_new();
+item = gtk_tool_button_new(pButton, NULL);
+gtk_toolbar_insert(GTK_TOOLBAR(pToolbar), item, -1);
+mpToolButtonStyle = gtk_widget_get_style_context(GTK_WIDGET(pButton));
 
 getStyleContext(&mpVScrollbarStyle, 
gtk_scrollbar_new(GTK_ORIENTATION_VERTICAL, NULL));
 gtk_style_context_add_class(mpVScrollbarStyle, GTK_STYLE_CLASS_SCROLLBAR);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-4-4' - source/text

[Andras Timar]

 source/text/shared/guide/startcenter.xhp |   27 +--
 1 file changed, 13 insertions(+), 14 deletions(-)

New commits:
commit 172c582a5c6f5f93997d99872114f9f1b2c6e415
Author: Andras Timar 
Date:   Tue Jul 7 14:52:38 2015 +0200

tdf#86301 fix hids of startcenter

(cherry picked from commit 5aad108719014b52c9aba6be407ed553d0095a66)

Conflicts:
source/text/shared/guide/startcenter.xhp

Change-Id: Ic33ff7519d820d9d770db6a3d2d067a81fb38272
Reviewed-on: https://gerrit.libreoffice.org/16818
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/source/text/shared/guide/startcenter.xhp 
b/source/text/shared/guide/startcenter.xhp
index 2544df5..1ff0f96 100644
--- a/source/text/shared/guide/startcenter.xhp
+++ b/source/text/shared/guide/startcenter.xhp
@@ -31,10 +31,10 @@
   start center
 
 
-
-
-
-
+
+
+
+
 Start Center
 
 Welcome to %PRODUCTNAME.
@@ -43,14 +43,13 @@
 You see the Start Center when no document is open in %PRODUCTNAME.
   It is divided into two panes.  Click an icon on the left pane 
to open a new document or a file dialog.
 
-
-
-
-
-
-
-The document icons each open a new document
-of the specified type.
+
+
+
+
+
+
+The document icons each open a new document of the 
specified type.
   
  
 
@@ -77,10 +76,10 @@
Formula opens %PRODUCTNAME Math
  
   
-
+
 The Templates icon opens the 
Templates and Documents dialog.
 The Templates icon opens the Templates and Documents 
dialog.
-
+
 The Open a Document icon presents 
a file open dialog.
 The Open a document icon presents a file open 
dialog.the four icons show a short explanation 
already
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

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

New commits:
commit 492f860898a08500bf164ba55db83bf086835458
Author: Andras Timar 
Date:   Tue Jul 7 14:52:38 2015 +0200

Updated core
Project: help  172c582a5c6f5f93997d99872114f9f1b2c6e415

tdf#86301 fix hids of startcenter

(cherry picked from commit 5aad108719014b52c9aba6be407ed553d0095a66)

Conflicts:
source/text/shared/guide/startcenter.xhp

Change-Id: Ic33ff7519d820d9d770db6a3d2d067a81fb38272
Reviewed-on: https://gerrit.libreoffice.org/16818
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index 40967ad..172c582 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 40967add67da1353dae0f1f9cc31475f4650381c
+Subproject commit 172c582a5c6f5f93997d99872114f9f1b2c6e415
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits