[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - canvas/source
canvas/source/cairo/cairo_canvashelper.cxx |8
canvas/source/vcl/canvashelper.cxx | 28 +++-
2 files changed, 15 insertions(+), 21 deletions(-)
New commits:
commit bed182f5f3059e30c3e53a163a031de1f0c2bc46
Author: Thorsten Behrens tbehr...@suse.com
Date: Tue Mar 6 23:07:00 2012 +0100
Another partial fix for fdo#45219
Make sure transparent polygons really only cover the polygonal area,
not the whole bounding box for sprites.
(cherry picked from commit 50309b9574c43de93a05576904813881eb7bc898)
Signed-off-by: Tor Lillqvist tlillqv...@suse.com
diff --git a/canvas/source/vcl/canvashelper.cxx
b/canvas/source/vcl/canvashelper.cxx
index 055edff..c5c5943 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -500,27 +500,21 @@ namespace vclcanvas
if( mp2ndOutDev )
{
-if( !nTransparency || bSourceAlpha )
+// HACK. Normally, CanvasHelper does not care
+// about actually what mp2ndOutDev is...
+// well, here we do assume a 1bpp target.
+if( nTransparency 127 )
{
-// HACK. Normally, CanvasHelper does not care
-// about actually what mp2ndOutDev is...
-if( bSourceAlpha nTransparency == 255 )
-{
-mp2ndOutDev-getOutDev().SetDrawMode(
DRAWMODE_WHITELINE | DRAWMODE_WHITEFILL | DRAWMODE_WHITETEXT |
-
DRAWMODE_WHITEGRADIENT | DRAWMODE_WHITEBITMAP );
-mp2ndOutDev-getOutDev().SetFillColor( COL_WHITE );
-mp2ndOutDev-getOutDev().DrawPolyPolygon( aPolyPoly );
-mp2ndOutDev-getOutDev().SetDrawMode(
DRAWMODE_BLACKLINE | DRAWMODE_BLACKFILL | DRAWMODE_BLACKTEXT |
-
DRAWMODE_BLACKGRADIENT | DRAWMODE_BLACKBITMAP );
-}
-else
-{
-mp2ndOutDev-getOutDev().DrawPolyPolygon( aPolyPoly );
-}
+mp2ndOutDev-getOutDev().SetDrawMode( DRAWMODE_WHITELINE |
DRAWMODE_WHITEFILL | DRAWMODE_WHITETEXT |
+
DRAWMODE_WHITEGRADIENT | DRAWMODE_WHITEBITMAP );
+mp2ndOutDev-getOutDev().SetFillColor( COL_WHITE );
+mp2ndOutDev-getOutDev().DrawPolyPolygon( aPolyPoly );
+mp2ndOutDev-getOutDev().SetDrawMode( DRAWMODE_BLACKLINE |
DRAWMODE_BLACKFILL | DRAWMODE_BLACKTEXT |
+
DRAWMODE_BLACKGRADIENT | DRAWMODE_BLACKBITMAP );
}
else
{
-mp2ndOutDev-getOutDev().DrawTransparent( aPolyPoly,
(sal_uInt16)nTransPercent );
+mp2ndOutDev-getOutDev().DrawPolyPolygon( aPolyPoly );
}
}
}
commit a1a4b8cdd14843457e520fa9494892e9704557d4
Author: Thorsten Behrens tbehr...@suse.com
Date: Tue Mar 6 20:36:06 2012 +0100
Consistent use of alpha in cairocanvas
Use GetIndex() instead of GetBlue() (does the same, but more
self-documenting); use opaque when no alpha channel consistently.
(cherry picked from commit 83114b27fac8ef723cbbaa734237210d9ad56a15)
Signed-off-by: Tor Lillqvist tlillqv...@suse.com
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx
b/canvas/source/cairo/cairo_canvashelper.cxx
index 6accc39..c5876a7 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -368,7 +368,7 @@ namespace cairocanvas
case BMP_FORMAT_8BIT_PAL:
pReadScan = pAlphaReadAcc-GetScanline( nY );
for( nX = 0; nX nWidth; nX++ ) {
-nAlpha = data[ nOff ] = 255 - ( pAlphaReadAcc-GetPaletteColor(
*pReadScan++ ).GetBlue() );
+nAlpha = data[ nOff ] = 255 - ( pAlphaReadAcc-GetPaletteColor(
*pReadScan++ ).GetIndex() );
if( nAlpha != 255 )
bIsAlpha = true;
nOff += 4;
@@ -377,7 +377,7 @@ namespace cairocanvas
default:
OSL_TRACE( fallback to GetColor for alpha - slow, format: %d,
pAlphaReadAcc-GetScanlineFormat() );
for( nX = 0; nX nWidth; nX++ ) {
-nAlpha = data[ nOff ] = 255 - pAlphaReadAcc-GetColor( nY, nX
).GetBlue();
+nAlpha = data[ nOff ] = 255 - pAlphaReadAcc-GetColor( nY, nX
).GetIndex();
if( nAlpha != 255 )
bIsAlpha = true;
nOff += 4;
@@ -541,7 +541,7 @@ namespace cairocanvas
if( pAlphaReadAcc )
nAlpha = data[ nOff++ ];
else
-nAlpha = data[ nOff++ ] = pReadScan[ 3 ];
+
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - canvas/source
canvas/source/vcl/canvashelper.cxx | 24
1 file changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 0ad246127fe8f9d788793ceb8dc327e25ef4a699
Author: Thorsten Behrens tbehr...@suse.com
Date: Wed Mar 7 00:31:56 2012 +0100
Return proper transparency value even for ignore_color.
Rather unexpectedly, calling setupOutDevState() with IGNORE_COLOR
does not return a proper transparency, but null. Fixed now.
(cherry picked from commit 4b475f31eb9b290b477bb6992ff28e52248cee5d)
Signed-off-by: Tor Lillqvist tlillqv...@suse.com
diff --git a/canvas/source/vcl/canvashelper.cxx
b/canvas/source/vcl/canvashelper.cxx
index c5c5943..5d4c40a 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -1269,21 +1269,21 @@ namespace vclcanvas
p2ndOutDev-SetClipRegion( aClipRegion );
}
-if( eColorType != IGNORE_COLOR )
-{
-Color aColor( COL_WHITE );
+Color aColor( COL_WHITE );
-if( renderState.DeviceColor.getLength() 2 )
-{
-aColor = ::vcl::unotools::stdColorSpaceSequenceToColor(
-renderState.DeviceColor );
-}
+if( renderState.DeviceColor.getLength() 2 )
+{
+aColor = ::vcl::unotools::stdColorSpaceSequenceToColor(
+renderState.DeviceColor );
+}
-// extract alpha, and make color opaque
-// afterwards. Otherwise, OutputDevice won't draw anything
-nTransparency = aColor.GetTransparency();
-aColor.SetTransparency(0);
+// extract alpha, and make color opaque
+// afterwards. Otherwise, OutputDevice won't draw anything
+nTransparency = aColor.GetTransparency();
+aColor.SetTransparency(0);
+if( eColorType != IGNORE_COLOR )
+{
switch( eColorType )
{
case LINE_COLOR:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - canvas/source
canvas/source/vcl/canvashelper.cxx | 45 +++--
canvas/source/vcl/canvashelper_texturefill.cxx | 38 +++--
2 files changed, 42 insertions(+), 41 deletions(-)
New commits:
commit e5cf9610961b0f6978e15b2a81b0f9aa769e0298
Author: Thorsten Behrens tbehr...@suse.com
Date: Wed Mar 7 00:34:52 2012 +0100
Use transparency for gradients fdo#45219
vclcanvas has 1bpp alpha - so cut-off transparency at 98%
This looks for all practical cases close enough to full alpha.
(cherry picked from commit 3f5efa1e76e187070d412d102e4c057679065bcc)
Signed-off-by: Tor Lillqvist tlillqv...@suse.com
diff --git a/canvas/source/vcl/canvashelper.cxx
b/canvas/source/vcl/canvashelper.cxx
index 5d4c40a..3649ccf 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -155,8 +155,9 @@ namespace vclcanvas
tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDev );
rOutDev.EnableMapMode( sal_False );
-rOutDev.SetLineColor( COL_TRANSPARENT );
-rOutDev.SetFillColor( COL_TRANSPARENT );
+rOutDev.SetLineColor( COL_WHITE );
+rOutDev.SetFillColor( COL_WHITE );
+rOutDev.SetClipRegion();
rOutDev.DrawRect( Rectangle( Point(),
rOutDev.GetOutputSizePixel()) );
@@ -166,8 +167,9 @@ namespace vclcanvas
rOutDev2.SetDrawMode( DRAWMODE_DEFAULT );
rOutDev2.EnableMapMode( sal_False );
-rOutDev2.SetLineColor( COL_TRANSPARENT );
-rOutDev2.SetFillColor( COL_TRANSPARENT );
+rOutDev2.SetLineColor( COL_WHITE );
+rOutDev2.SetFillColor( COL_WHITE );
+rOutDev2.SetClipRegion();
rOutDev2.DrawRect( Rectangle( Point(),
rOutDev2.GetOutputSizePixel()) );
rOutDev2.SetDrawMode( DRAWMODE_BLACKLINE | DRAWMODE_BLACKFILL
| DRAWMODE_BLACKTEXT |
@@ -500,19 +502,11 @@ namespace vclcanvas
if( mp2ndOutDev )
{
-// HACK. Normally, CanvasHelper does not care
-// about actually what mp2ndOutDev is...
-// well, here we do assume a 1bpp target.
-if( nTransparency 127 )
-{
-mp2ndOutDev-getOutDev().SetDrawMode( DRAWMODE_WHITELINE |
DRAWMODE_WHITEFILL | DRAWMODE_WHITETEXT |
-
DRAWMODE_WHITEGRADIENT | DRAWMODE_WHITEBITMAP );
-mp2ndOutDev-getOutDev().SetFillColor( COL_WHITE );
-mp2ndOutDev-getOutDev().DrawPolyPolygon( aPolyPoly );
-mp2ndOutDev-getOutDev().SetDrawMode( DRAWMODE_BLACKLINE |
DRAWMODE_BLACKFILL | DRAWMODE_BLACKTEXT |
-
DRAWMODE_BLACKGRADIENT | DRAWMODE_BLACKBITMAP );
-}
-else
+// HACK. Normally, CanvasHelper does not care about
+// actually what mp2ndOutDev is... well, here we do
+// assume a 1bpp target - everything beyond 97%
+// transparency is fully transparent
+if( nTransparency 253 )
{
mp2ndOutDev-getOutDev().DrawPolyPolygon( aPolyPoly );
}
@@ -715,8 +709,25 @@ namespace vclcanvas
aBmpEx );
if( mp2ndOutDev )
+{
+// HACK. Normally, CanvasHelper does not care about
+// actually what mp2ndOutDev is... well, here we do
+// assume a 1bpp target - everything beyond 97%
+// transparency is fully transparent
+if( aBmpEx.IsAlpha() )
+{
+Bitmap aMask( aBmpEx.GetAlpha().GetBitmap() );
+aMask.MakeMono( 253 );
+aBmpEx = BitmapEx( aBmpEx.GetBitmap(), aMask );
+}
+else if( aBmpEx.IsTransparent() )
+{
+aBmpEx = BitmapEx( aBmpEx.GetBitmap(),
aBmpEx.GetMask() );
+}
+
mp2ndOutDev-getOutDev().DrawBitmapEx(
::vcl::unotools::pointFromB2DPoint( aOutputPos ),
aBmpEx );
+}
// Returning a cache object is not useful, the XBitmap
// itself serves this purpose
diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx
b/canvas/source/vcl/canvashelper_texturefill.cxx
index 325d2b6..3811ebd 100644
--- a/canvas/source/vcl/canvashelper_texturefill.cxx
+++ b/canvas/source/vcl/canvashelper_texturefill.cxx
@@ -555,8 +555,6 @@ namespace vclcanvas
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - slideshow/source
slideshow/source/engine/slide/layer.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 047f6738d045ef94112ed45ed2eabb73e5e07111 Author: Thorsten Behrens tbehr...@suse.com Date: Fri Mar 16 00:11:53 2012 +0100 Clear full sprite area for fdo#45219 Use clearAll() here, to really clear the whole sprite area (clear() does respect potential clip polygons) (cherry picked from commit e86bcf11340f35afe899d02aa5facdbecdd309ab) Signed-off-by: Tor Lillqvist tlillqv...@suse.com diff --git a/slideshow/source/engine/slide/layer.cxx b/slideshow/source/engine/slide/layer.cxx index c9e064b..05260c9 100644 --- a/slideshow/source/engine/slide/layer.cxx +++ b/slideshow/source/engine/slide/layer.cxx @@ -222,7 +222,7 @@ namespace slideshow std::for_each( maViewEntries.begin(), maViewEntries.end(), boost::bind( - ViewLayer::clear, + ViewLayer::clearAll, boost::bind( ViewEntry::getViewLayer, _1))); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - slideshow/source
slideshow/source/engine/slideview.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6f7a003ef738e3b11ff8d577c2b350b50d416235
Author: Thorsten Behrens tbehr...@suse.com
Date: Fri Mar 16 10:02:18 2012 +0100
Clear sprites to white fdo#45219.
Another fix for a rendering glitch mentioned in fdo#45219 -
vclcanvas sadly does not properly implement compositing, so all-
black background yields dark shadows on semi-transparent objects.
Ultimately though, we should retire vclcanvas instead.
(cherry picked from commit b9266113514657be1cf9352e1457a5c62876784c)
Signed-off-by: Tor Lillqvist tlillqv...@suse.com
diff --git a/slideshow/source/engine/slideview.cxx
b/slideshow/source/engine/slideview.cxx
index 001f533..0d55528 100644
--- a/slideshow/source/engine/slideview.cxx
+++ b/slideshow/source/engine/slideview.cxx
@@ -206,7 +206,7 @@ void clearRect( ::cppcanvas::CanvasSharedPtr const pCanvas,
if( pPolyPoly )
{
pPolyPoly-setCompositeOp( cppcanvas::CanvasGraphic::SOURCE );
-pPolyPoly-setRGBAFillColor( 0xU );
+pPolyPoly-setRGBAFillColor( 0xFF00U );
pPolyPoly-draw();
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - slideshow/source
slideshow/source/engine/slideview.cxx | 15 +++
1 file changed, 11 insertions(+), 4 deletions(-)
New commits:
commit e3f835eee16ac7d9dfa76eed8c043e7874995058
Author: Thorsten Behrens tbehr...@suse.com
Date: Fri Mar 16 10:06:08 2012 +0100
Clear whole layer in slideshow sprites fdo#45219
The clear() previously offsetted the topleft rect corner for sprites
by _the sprite topleft_ position, which is rather unhelpful but for
sprites located at (0,0).
(cherry picked from commit d32cf8d820be839c7303e3c5962c17f64cac2812)
Signed-off-by: Tor Lillqvist tlillqv...@suse.com
diff --git a/slideshow/source/engine/slideview.cxx
b/slideshow/source/engine/slideview.cxx
index 0d55528..2309c4c 100644
--- a/slideshow/source/engine/slideview.cxx
+++ b/slideshow/source/engine/slideview.cxx
@@ -557,20 +557,27 @@ private:
virtual void clear() const
{
-// keep layer clip
-clearRect(getCanvas()-clone(),
- maLayerBoundsPixel);
+// grab canvas - that also lazy-initializes maLayerBoundsPixel
+cppcanvas::CanvasSharedPtr pCanvas=getCanvas()-clone();
+
+// clear whole canvas
+const basegfx::B2I64Tuple rSpriteSize(maLayerBoundsPixel.getRange());
+clearRect(pCanvas,
+
basegfx::B2IRange(0,0,rSpriteSize.getX(),rSpriteSize.getY()));
}
virtual void clearAll() const
{
+// grab canvas - that also lazy-initializes maLayerBoundsPixel
::cppcanvas::CanvasSharedPtr pCanvas( getCanvas()-clone() );
// clear layer clip, to clear whole area
pCanvas-setClip();
+// clear whole canvas
+const basegfx::B2I64Tuple rSpriteSize(maLayerBoundsPixel.getRange());
clearRect(pCanvas,
- maLayerBoundsPixel);
+
basegfx::B2IRange(0,0,rSpriteSize.getX(),rSpriteSize.getY()));
}
virtual bool isOnView(boost::shared_ptrView const rView) const
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - canvas/source
canvas/source/vcl/canvashelper_texturefill.cxx | 52 -
1 file changed, 52 deletions(-)
New commits:
commit a95769b378b9d4d77d4409cd72dcdccf32e32744
Author: Thorsten Behrens tbehr...@suse.com
Date: Tue Mar 6 23:09:58 2012 +0100
Remove nasty xor hack for non-Mac vclcanvas
This nowadays really is a pessimization.
(cherry picked from commit 315d82d741c37d1b77f5687b1bdc48a37fb9f29f)
Signed-off-by: Tor Lillqvist tlillqv...@suse.com
diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx
b/canvas/source/vcl/canvashelper_texturefill.cxx
index 3811ebd..1021d33 100644
--- a/canvas/source/vcl/canvashelper_texturefill.cxx
+++ b/canvas/source/vcl/canvashelper_texturefill.cxx
@@ -615,7 +615,6 @@ namespace vclcanvas
}
}
else
-#if defined(QUARTZ) // TODO: other ports should avoid the XOR-trick too
(implementation vs. interface!)
{
const Region aPolyClipRegion( rPoly );
@@ -641,57 +640,6 @@ namespace vclcanvas
p2ndOutDev-DrawPolyPolygon( rPoly );
}
}
-#else // TODO: remove once doing the XOR-trick in the canvas-layer becomes
redundant
-{
-// output gradient the hard way: XORing out the polygon
-rOutDev.Push( PUSH_RASTEROP );
-rOutDev.SetRasterOp( ROP_XOR );
-doGradientFill( rOutDev,
-rValues,
-rColors,
-aTotalTransform,
-aPolygonDeviceRectOrig,
-nStepCount,
-true );
-rOutDev.SetFillColor( COL_BLACK );
-rOutDev.SetRasterOp( ROP_0 );
-rOutDev.DrawPolyPolygon( rPoly );
-rOutDev.SetRasterOp( ROP_XOR );
-doGradientFill( rOutDev,
-rValues,
-rColors,
-aTotalTransform,
-aPolygonDeviceRectOrig,
-nStepCount,
-true );
-rOutDev.Pop();
-
-if( p2ndOutDev )
-{
-p2ndOutDev-Push( PUSH_RASTEROP );
-p2ndOutDev-SetRasterOp( ROP_XOR );
-doGradientFill( *p2ndOutDev,
-rValues,
-rColors,
-aTotalTransform,
-aPolygonDeviceRectOrig,
-nStepCount,
-true );
-p2ndOutDev-SetFillColor( COL_BLACK );
-p2ndOutDev-SetRasterOp( ROP_0 );
-p2ndOutDev-DrawPolyPolygon( rPoly );
-p2ndOutDev-SetRasterOp( ROP_XOR );
-doGradientFill( *p2ndOutDev,
-rValues,
-rColors,
-aTotalTransform,
-aPolygonDeviceRectOrig,
-nStepCount,
-true );
-p2ndOutDev-Pop();
-}
-}
-#endif // complex-clipping vs. XOR-trick
#if OSL_DEBUG_LEVEL 3
// extra-verbosity
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - svx/inc
svx/inc/svx/sdrpaintwindow.hxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 4d3eaff534a7c97dc4d296f6b3cea4578db24182 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Sat Mar 17 08:39:26 2012 +0100 workaround broken msvc template instantiation (cherry picked from commit 9865a0d430da8948210a2cd9d4bae08e6023f4c8) Signed-off-by: Tor Lillqvist tlillqv...@suse.com diff --git a/svx/inc/svx/sdrpaintwindow.hxx b/svx/inc/svx/sdrpaintwindow.hxx index 9ecfbed..c6faaa2 100644 --- a/svx/inc/svx/sdrpaintwindow.hxx +++ b/svx/inc/svx/sdrpaintwindow.hxx @@ -45,6 +45,9 @@ namespace sdr } // end of namespace overlay } // end of namespace sdr +#ifdef _MSC_VER // broken msvc template instantiation +#include svx/sdr/overlay/overlaymanager.hxx +#endif class SdrPreRenderDevice ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sfx2/source
sfx2/source/dialog/alienwarn.cxx | 41 +++
1 file changed, 12 insertions(+), 29 deletions(-)
New commits:
commit 0449662bb3f493730ea977a1864afbc82ee16d12
Author: Andras Timar ati...@suse.com
Date: Fri Mar 9 22:34:08 2012 +0100
fix semantic error in layout calculation
(cherry picked from commit cc32ce47cef1a72a820a9475a9a2753490a019f2)
Signed-off-by: Tor Lillqvist tlillqv...@suse.com
diff --git a/sfx2/source/dialog/alienwarn.cxx b/sfx2/source/dialog/alienwarn.cxx
index 8ed0b71..1dfecd0 100644
--- a/sfx2/source/dialog/alienwarn.cxx
+++ b/sfx2/source/dialog/alienwarn.cxx
@@ -96,49 +96,32 @@ SfxAlienWarningDialog::~SfxAlienWarningDialog()
void SfxAlienWarningDialog::InitSize()
{
-// if the button text is too wide, then broaden the button
-long nTxtW = m_aMoreInfoBtn.GetCtrlTextWidth( m_aMoreInfoBtn.GetText() );
-long nCtrlW = m_aMoreInfoBtn.GetSizePixel().Width();
-if ( nTxtW = nCtrlW )
-{
-long nDelta = nTxtW - nCtrlW;
-nDelta += IMPL_EXTRA_BUTTON_WIDTH;
-Point aNextPoint = m_aKeepCurrentBtn.GetPosPixel();
-aNextPoint.X() += m_aKeepCurrentBtn.GetSizePixel().Width();
-Point aNewPoint = m_aMoreInfoBtn.GetPosPixel();
-aNewPoint.X() -= nDelta;
-if ( aNextPoint.X() = aNewPoint.X() )
-{
-long nSpace = aNextPoint.X() - aNewPoint.X();
-nSpace += 2;
-nDelta -= nSpace;
-aNewPoint.X() += nSpace;
-}
-Size aNewSize = m_aMoreInfoBtn.GetSizePixel();
-aNewSize.Width() += nDelta;
-m_aMoreInfoBtn.SetPosSizePixel( aNewPoint, aNewSize );
-}
+const long nExtraButtonWidth = LogicToPixel(
Size(IMPL_EXTRA_BUTTON_WIDTH,1), MapMode(MAP_APPFONT) ).getWidth();
+const long nAwCol2 = LogicToPixel( Size(AW_COL_2,1), MapMode(MAP_APPFONT)
).getWidth();
+long nTxtW, nCtrlW;
-// recalculate the size and position of the buttons
+// layout calculations should be re-done, when More Info button is enabled
m_aMoreInfoBtn.Hide();
+
+// recalculate the size and position of the buttons
nTxtW = m_aKeepCurrentBtn.GetCtrlTextWidth( m_aKeepCurrentBtn.GetText() );
-nTxtW += IMPL_EXTRA_BUTTON_WIDTH;
+nTxtW += nExtraButtonWidth;
Size aNewSize = m_aKeepCurrentBtn.GetSizePixel();
aNewSize.Width() = nTxtW;
m_aKeepCurrentBtn.SetSizePixel( aNewSize );
Point aPos = m_aSaveODFBtn.GetPosPixel();
-aPos.X() = AW_COL_3 + nTxtW;
+aPos.X() = nAwCol2 + nTxtW + nExtraButtonWidth;
m_aSaveODFBtn.SetPosPixel( aPos );
nTxtW = m_aSaveODFBtn.GetCtrlTextWidth( m_aSaveODFBtn.GetText() );
-nTxtW += IMPL_EXTRA_BUTTON_WIDTH;
+nTxtW += nExtraButtonWidth;
aNewSize = m_aSaveODFBtn.GetSizePixel();
aNewSize.Width() = nTxtW;
m_aSaveODFBtn.SetSizePixel( aNewSize );
-long nBtnsWidthSize = m_aKeepCurrentBtn.GetSizePixel().Width() +
m_aSaveODFBtn.GetSizePixel().Width() + AW_COL_3 + IMPL_EXTRA_BUTTON_WIDTH;
+long nBtnsWidthSize = m_aKeepCurrentBtn.GetSizePixel().Width() +
m_aSaveODFBtn.GetSizePixel().Width() + nAwCol2 + 2*nExtraButtonWidth;
// resize + text of checkbox too wide - add new line
aNewSize = m_aWarningOnBox.GetSizePixel();
-aNewSize.Width() = nBtnsWidthSize - 4*IMPL_EXTRA_BUTTON_WIDTH;
+aNewSize.Width() = nBtnsWidthSize - 2*nExtraButtonWidth;
m_aWarningOnBox.SetSizePixel( aNewSize );
nTxtW = m_aWarningOnBox.GetCtrlTextWidth( m_aWarningOnBox.GetText() );
nCtrlW = m_aWarningOnBox.GetSizePixel().Width();
@@ -154,7 +137,7 @@ void SfxAlienWarningDialog::InitSize()
// resize + align the size of the information text control (FixedText) to
its content
aNewSize = m_aInfoText.GetSizePixel();
-aNewSize.Width() = nBtnsWidthSize - 4*IMPL_EXTRA_BUTTON_WIDTH;
+aNewSize.Width() = nBtnsWidthSize - 2*nExtraButtonWidth;
m_aInfoText.SetSizePixel( aNewSize );
Size aMinSize = m_aInfoText.CalcMinimumSize(
m_aInfoText.GetSizePixel().Width() );
long nTxtH = aMinSize.Height();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/ui/app/transobj.cxx | 15 ++-
1 file changed, 14 insertions(+), 1 deletion(-)
New commits:
commit 39228c6d2419636be04ee4a320a7c0ca08276f37
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Sun Mar 18 18:34:51 2012 +0100
also shrink used area for HTML in some cases, fdo#46230, n#677811
Hopefully this will allow pasting to external applications with whole
column/row selected while not affecting calc itself.
(cherry picked from commit 0ee518863337fba9bce019e05e24f527617a4321)
Signed-off-by: Tor Lillqvist tlillqv...@suse.com
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index a61e5d3..ae73542 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -313,7 +313,20 @@ sal_Bool ScTransferObj::GetData( const
datatransfer::DataFlavor rFlavor )
sal_Bool bIncludeFiltered = pDoc-IsCutMode() || bUsedForLink;
-ScImportExport aObj( pDoc, aBlock );
+ScRange aReducedBlock = aBlock;
+if ( nFormat == SOT_FORMATSTR_ID_HTML (aBlock.aEnd.Col() ==
MAXCOL || aBlock.aEnd.Row() == MAXROW) aBlock.aStart.Tab() ==
aBlock.aEnd.Tab() )
+{
+bool bShrunk = false;
+//shrink the area to allow pasting to external applications
+SCCOL aStartCol = aReducedBlock.aStart.Col();
+SCROW aStartRow = aReducedBlock.aStart.Row();
+SCCOL aEndCol = aReducedBlock.aEnd.Col();
+SCROW aEndRow = aReducedBlock.aEnd.Row();
+pDoc-ShrinkToUsedDataArea( bShrunk,
aReducedBlock.aStart.Tab(), aStartCol, aStartRow, aEndCol, aEndRow, false);
+aReducedBlock = ScRange(aStartCol, aStartRow,
aReducedBlock.aStart.Tab(), aEndCol, aEndRow, aReducedBlock.aEnd.Tab());
+}
+
+ScImportExport aObj( pDoc, aReducedBlock );
ScExportTextOptions aTextOptions(ScExportTextOptions::None, 0,
true);
if ( bUsedForLink )
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/filter/xml/xmldrani.cxx | 10 +++---
sc/source/filter/xml/xmldrani.hxx |2 ++
2 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit a0d2fd2096e267a29c5b8a07b0349e699e13ded5
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Sun Mar 18 17:44:00 2012 +0100
add all imported properties to ScDBData, fdo#40426
(cherry picked from commit ed88b144ce24b9a733d4a9ab6614307c96537baa)
Signed-off-by: Tor Lillqvist tlillqv...@suse.com
diff --git a/sc/source/filter/xml/xmldrani.cxx
b/sc/source/filter/xml/xmldrani.cxx
index 653af63..a0ca754 100644
--- a/sc/source/filter/xml/xmldrani.cxx
+++ b/sc/source/filter/xml/xmldrani.cxx
@@ -148,6 +148,8 @@ ScXMLDatabaseRangeContext::ScXMLDatabaseRangeContext(
ScXMLImport rImport,
bSubTotalsEnabledUserList(false),
bSubTotalsAscending(true),
bFilterConditionSourceRange(false),
+bHasHeader(true),
+bByRow(false),
meRangeType(ScDBCollection::GlobalNamed)
{
nSourceType = sheet::DataImportMode_NONE;
@@ -190,12 +192,14 @@ ScXMLDatabaseRangeContext::ScXMLDatabaseRangeContext(
ScXMLImport rImport,
break;
case XML_TOK_DATABASE_RANGE_ATTR_ORIENTATION :
{
-mpQueryParam-bByRow = !IsXMLToken(sValue, XML_COLUMN);
+bByRow = !IsXMLToken(sValue, XML_COLUMN);
+mpQueryParam-bByRow = bByRow;
}
break;
case XML_TOK_DATABASE_RANGE_ATTR_CONTAINS_HEADER :
{
-mpQueryParam-bHasHeader = IsXMLToken(sValue, XML_TRUE);
+bHasHeader = IsXMLToken(sValue, XML_TRUE);
+mpQueryParam-bHasHeader = bHasHeader;
}
break;
case XML_TOK_DATABASE_RANGE_ATTR_DISPLAY_FILTER_BUTTONS :
@@ -303,7 +307,7 @@ ScDBData* ScXMLDatabaseRangeContext::ConvertToDBData(const
OUString rName)
SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptrScDBData pData(
-new ScDBData(rName, maRange.aStart.Tab(), maRange.aStart.Col(),
maRange.aStart.Row(), maRange.aEnd.Col(), maRange.aEnd.Row()));
+new ScDBData(rName, maRange.aStart.Tab(), maRange.aStart.Col(),
maRange.aStart.Row(), maRange.aEnd.Col(), maRange.aEnd.Row(), bByRow,
bHasHeader));
SAL_WNODEPRECATED_DECLARATIONS_POP
pData-SetAutoFilter(bAutoFilter);
diff --git a/sc/source/filter/xml/xmldrani.hxx
b/sc/source/filter/xml/xmldrani.hxx
index 9fe1408..ff659f8 100644
--- a/sc/source/filter/xml/xmldrani.hxx
+++ b/sc/source/filter/xml/xmldrani.hxx
@@ -106,6 +106,8 @@ class ScXMLDatabaseRangeContext : public SvXMLImportContext
boolbSubTotalsEnabledUserList;
boolbSubTotalsAscending;
boolbFilterConditionSourceRange;
+boolbHasHeader;
+boolbByRow;
ScDBCollection::RangeType meRangeType;
const ScXMLImport GetScImport() const { return (const
ScXMLImport)GetImport(); }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: libcdr/libcdr-0.0.5.patch
libcdr/libcdr-0.0.5.patch | 15 +++ 1 file changed, 15 insertions(+) New commits: commit 85f074554788e2d8da73e77855ca06bc0fdfbaa4 Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Mar 19 09:40:19 2012 +0200 lcms2 uses stdcall for some reason diff --git a/libcdr/libcdr-0.0.5.patch b/libcdr/libcdr-0.0.5.patch index b622bd6..279c365 100644 --- a/libcdr/libcdr-0.0.5.patch +++ b/libcdr/libcdr-0.0.5.patch @@ -18,3 +18,18 @@ #endif +--- misc/libcdr-0.0.5/src/lib/makefile.mk misc/build/libcdr-0.0.5/src/lib/makefile.mk +@@ -32,6 +32,12 @@ + INCPRE+=$(LCMS2_CFLAGS) + .ELSE + INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/lcms2 ++.IF $(COM) == MSC ++# lcms2 gets built to use the stdcall calling convention, for some reason. ++# The lcms2 headers need this in order to decorate functions with stdcall, ++# so that they will be found when linking. ++CDEFS+=-DCMS_DLL ++.ENDIF + .ENDIF + + .IF $(SYSTEM_ZLIB) != YES ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - lcms2/lcms2-windows-export.patch lcms2/makefile.mk libcdr/libcdr-0.0.5.patch
lcms2/lcms2-windows-export.patch | 18 ++ lcms2/makefile.mk|2 +- libcdr/libcdr-0.0.5.patch| 15 --- 3 files changed, 19 insertions(+), 16 deletions(-) New commits: commit 6ea1578264b4aaf6384c654098915f6e952dd1b0 Author: Lubos Lunak l.lu...@suse.cz Date: Mon Mar 19 09:45:15 2012 +0200 Define CMS_DLL in the header as that is how we build it Otherwise code using the lcms2 we build won't get the stdcall decorations and linking will fail. diff --git a/lcms2/lcms2-windows-export.patch b/lcms2/lcms2-windows-export.patch new file mode 100644 index 000..9d6d26a --- /dev/null +++ b/lcms2/lcms2-windows-export.patch @@ -0,0 +1,18 @@ +--- misc/build/lcms2-2.3/include/lcms2.h.sav 2011-12-15 16:45:47.0 +0100 misc/build/lcms2-2.3/include/lcms2.h 2012-03-17 22:53:28.731585981 +0100 +@@ -192,6 +192,15 @@ typedef int cmsBool; + # endif + #endif + ++// LibreOffice always builds this as DLL and with the stdcall calling ++// convention, so make this usable from outside without having to ++// specify CMS_DLL manually whenever the library is used. ++#ifndef CMS_DLL_BUILD ++#ifndef CMS_DLL ++#define CMS_DLL ++#endif ++#endif ++ + // Calling convention -- this is hardly platform and compiler dependent + #ifdef CMS_IS_WINDOWS_ + # if defined(CMS_DLL) || defined(CMS_DLL_BUILD) diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk index 0c7f5d5..2be34b5 100644 --- a/lcms2/makefile.mk +++ b/lcms2/makefile.mk @@ -39,7 +39,7 @@ TARGET=so_lcms2 TARFILE_NAME=lcms2-2.3 TARFILE_MD5=327348d67c979c88c2dec59a23a17d85 -PATCH_FILES = lcms2.patch +PATCH_FILES = lcms2.patch lcms2-windows-export.patch .IF $(SYSTEM_LCMS2) == YES @all: commit f257c29b6cfba0110bafe33bc02003cc757b5999 Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Mar 19 09:42:19 2012 +0200 Revert lcms2 uses stdcall for some reason Nah, will use the patch by Lubos instead. This reverts commit 85f074554788e2d8da73e77855ca06bc0fdfbaa4. diff --git a/libcdr/libcdr-0.0.5.patch b/libcdr/libcdr-0.0.5.patch index 279c365..b622bd6 100644 --- a/libcdr/libcdr-0.0.5.patch +++ b/libcdr/libcdr-0.0.5.patch @@ -18,18 +18,3 @@ #endif misc/libcdr-0.0.5/src/lib/makefile.mk -+++ misc/build/libcdr-0.0.5/src/lib/makefile.mk -@@ -32,6 +32,12 @@ - INCPRE+=$(LCMS2_CFLAGS) - .ELSE - INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/lcms2 -+.IF $(COM) == MSC -+# lcms2 gets built to use the stdcall calling convention, for some reason. -+# The lcms2 headers need this in order to decorate functions with stdcall, -+# so that they will be found when linking. -+CDEFS+=-DCMS_DLL -+.ENDIF - .ENDIF - - .IF $(SYSTEM_ZLIB) != YES ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - sw/qa writerfilter/source
sw/qa/extras/rtftok/data/fdo43965.rtf | 16 +++
sw/qa/extras/rtftok/rtftok.cxx | 35 +
writerfilter/source/dmapper/BorderHandler.cxx |2 -
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 13 ++---
4 files changed, 55 insertions(+), 11 deletions(-)
New commits:
commit dd875e4f6a7b6c6bea7121f701821d7c7ba7f6d0
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Mar 16 14:23:36 2012 +0100
testcase for fdo#43965
diff --git a/sw/qa/extras/rtftok/data/fdo43965.rtf
b/sw/qa/extras/rtftok/data/fdo43965.rtf
new file mode 100644
index 000..968fe77
--- /dev/null
+++ b/sw/qa/extras/rtftok/data/fdo43965.rtf
@@ -0,0 +1,16 @@
+{\rtf1\ansi\ansicpg1252
+{\fonttbl \f0\froman\fcharset0 Times;\f1\fswiss\fcharset0 Helvetica;}
+{\info{\subject Test file for LibreOffice 3.5}}
+\margl1440\margr1440\margt1440\margb1440\deftab720\viewkind1\viewscale100
+\pard\pardeftab720\ql\qnatural
+\f0\fs36
+{
+{\fs22\up8 2}
+}\
+{\box\brdrsBox
+}\
+Page feeds:\
+ This is on the first page.\
+\page
+ This is on the second page.\
+}
diff --git a/sw/qa/extras/rtftok/rtftok.cxx b/sw/qa/extras/rtftok/rtftok.cxx
index 95fc51b..c376779 100644
--- a/sw/qa/extras/rtftok/rtftok.cxx
+++ b/sw/qa/extras/rtftok/rtftok.cxx
@@ -33,9 +33,11 @@
#include com/sun/star/table/BorderLineStyle.hpp
#include com/sun/star/text/RelOrientation.hpp
#include com/sun/star/text/SizeType.hpp
+#include com/sun/star/text/XPageCursor.hpp
#include com/sun/star/text/XTextDocument.hpp
#include com/sun/star/text/XTextGraphicObjectsSupplier.hpp
#include com/sun/star/text/XTextFramesSupplier.hpp
+#include com/sun/star/text/XTextViewCursorSupplier.hpp
#include rtl/oustringostreaminserter.hxx
#include test/bootstrapfixture.hxx
@@ -64,6 +66,7 @@ public:
void testFdo46662();
void testN750757();
void testFdo45563();
+void testFdo43965();
CPPUNIT_TEST_SUITE(RtfModelTest);
#if !defined(MACOSX) !defined(WNT)
@@ -76,6 +79,7 @@ public:
CPPUNIT_TEST(testFdo46662);
CPPUNIT_TEST(testN750757);
CPPUNIT_TEST(testFdo45563);
+CPPUNIT_TEST(testFdo43965);
#endif
CPPUNIT_TEST_SUITE_END();
@@ -339,6 +343,37 @@ void RtfModelTest::testFdo45563()
CPPUNIT_ASSERT_EQUAL(4, i);
}
+void RtfModelTest::testFdo43965()
+{
+load(OUString(RTL_CONSTASCII_USTRINGPARAM(fdo43965.rtf)));
+uno::Referencetext::XTextDocument xTextDocument(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XEnumerationAccess
xParaEnumAccess(xTextDocument-getText(), uno::UNO_QUERY);
+uno::Referencecontainer::XEnumeration xParaEnum =
xParaEnumAccess-createEnumeration();
+
+// First paragraph: the parameter of \up was ignored
+uno::Referencecontainer::XEnumerationAccess
xRangeEnumAccess(xParaEnum-nextElement(), uno::UNO_QUERY);
+uno::Referencecontainer::XEnumeration xRangeEnum =
xRangeEnumAccess-createEnumeration();
+uno::Referencebeans::XPropertySet
xPropertySet(xRangeEnum-nextElement(), uno::UNO_QUERY);
+sal_Int32 nValue;
+
xPropertySet-getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(CharEscapement)))
= nValue;
+CPPUNIT_ASSERT_EQUAL(sal_Int32(58), nValue);
+
xPropertySet-getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(CharEscapementHeight)))
= nValue;
+CPPUNIT_ASSERT_EQUAL(sal_Int32(100), nValue);
+
+// Second paragraph: Word vs Writer border default problem
+xPropertySet.set(xParaEnum-nextElement(), uno::UNO_QUERY);
+table::BorderLine2 aBorder;
+
xPropertySet-getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(TopBorder)))
= aBorder;
+CPPUNIT_ASSERT_EQUAL(sal_uInt32(26), aBorder.LineWidth);
+
+// Finally, make sure that we have two pages
+uno::Referenceframe::XModel xModel(mxComponent, uno::UNO_QUERY);
+uno::Referencetext::XTextViewCursorSupplier
xTextViewCursorSupplier(xModel-getCurrentController(), uno::UNO_QUERY);
+uno::Referencetext::XPageCursor
xCursor(xTextViewCursorSupplier-getViewCursor(), uno::UNO_QUERY);
+xCursor-jumpToLastPage();
+CPPUNIT_ASSERT_EQUAL(sal_Int16(2), xCursor-getPage());
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(RtfModelTest);
CPPUNIT_PLUGIN_IMPLEMENT();
commit dac6b7938173d0793810ee5731de51c440c1af5e
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Mar 16 13:49:00 2012 +0100
fdo#43965 fix RTF import of \up and \dn with custom parameters
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 3e0c9b9..f8da21d 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2252,18 +2252,11 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
m_aStates.top().aCharacterSprms-push_back(make_pair(0x6877,
pValue));
}
break;
-case RTF_UP: // TODO handle when point size is not shrinking
-{
-OUString
[Libreoffice-commits] .: 2 commits - config_host.mk.in configure.in external/mingw-dlls scp2/source
config_host.mk.in |2 ++ configure.in|4 external/mingw-dlls/makefile.mk |2 ++ scp2/source/ooo/makefile.mk | 12 scp2/source/ooo/mingw_dlls.scp |9 + 5 files changed, 29 insertions(+) New commits: commit 28eaee81ac06866435351d87846868732d5afeb6 Author: David Tardon dtar...@redhat.com Date: Mon Mar 19 09:19:26 2012 +0100 mingw: check for jpeg dll diff --git a/config_host.mk.in b/config_host.mk.in index 002ff8e..828fd82 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -298,6 +298,7 @@ export MINGW_ICUI18N_DLL=@MINGW_ICUI18N_DLL@ export MINGW_ICUUC_DLL=@MINGW_ICUUC_DLL@ export MINGW_IDN_DLL=@MINGW_IDN_DLL@ export MINGW_INTL_DLL=@MINGW_INTL_DLL@ +export MINGW_JPEG_DLL=@MINGW_JPEG_DLL@ export MINGW_LCMS2_DLL=@MINGW_LCMS2_DLL@ export MINGW_LIBXML_DLL=@MINGW_LIBXML_DLL@ export MINGW_LIBXSLT_DLL=@MINGW_LIBXSLT_DLL@ diff --git a/configure.in b/configure.in index 68a0e3b..055e061 100644 --- a/configure.in +++ b/configure.in @@ -5765,12 +5765,14 @@ if test $with_system_jpeg = yes; then [AC_MSG_ERROR(jpeg.h not found. install libjpeg)], []) AC_CHECK_LIB(jpeg, jpeg_resync_to_restart, [ JPEG3RDLIB=-ljpeg ], [AC_MSG_CHECKING(jpeg library not found or fuctional)], []) +libo_MINGW_CHECK_DLL([JPEG], [libjpeg]) else AC_MSG_RESULT([internal]) SYSTEM_JPEG=NO BUILD_TYPE=$BUILD_TYPE JPEG fi AC_SUBST(SYSTEM_JPEG) +AC_SUBST([MINGW_JPEG_DLL]) dnl === dnl Check for system clucene diff --git a/external/mingw-dlls/makefile.mk b/external/mingw-dlls/makefile.mk index bc64b27..50aa73b 100644 --- a/external/mingw-dlls/makefile.mk +++ b/external/mingw-dlls/makefile.mk @@ -61,6 +61,7 @@ MINGW_DLLS:= \ $(MINGW_ICUUC_DLL) \ $(MINGW_IDN_DLL) \ $(MINGW_INTL_DLL) \ +$(MINGW_JPEG_DLL) \ $(MINGW_LCMS2_DLL) \ $(MINGW_LIBXML_DLL) \ $(MINGW_LIBXSLT_DLL) \ diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index 3d8c068..501ee3e 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -172,6 +172,10 @@ SCPDEFS+=-DSYSTEM_HUNSPELL SCPDEFS+=-DSYSTEM_HYPH .ENDIF +.IF $(SYSTEM_JPEG) == YES +SCPDEFS+=-DSYSTEM_JPEG +.ENDIF + .IF $(SYSTEM_MYTHES) == YES SCPDEFS+=-DSYSTEM_MYTHES .ENDIF @@ -333,6 +337,10 @@ SCPDEFS += -DNEEDS_MINGW_IDN_DLL -DMINGW_IDN_DLL=\$(MINGW_IDN_DLL)\ SCPDEFS += -DNEEDS_MINGW_INTL_DLL -DMINGW_INTL_DLL=\$(MINGW_INTL_DLL)\ .ENDIF +.IF $(MINGW_JPEG_DLL) != +SCPDEFS += -DNEEDS_MINGW_JPEG_DLL -DMINGW_JPEG_DLL=\$(MINGW_JPEG_DLL)\ +.ENDIF + .IF $(MINGW_LCMS2_DLL) != SCPDEFS += -DNEEDS_MINGW_LCMS2_DLL -DMINGW_LCMS2_DLL=\$(MINGW_LCMS2_DLL)\ .ENDIF diff --git a/scp2/source/ooo/mingw_dlls.scp b/scp2/source/ooo/mingw_dlls.scp index 4dff90c..8a3098f 100644 --- a/scp2/source/ooo/mingw_dlls.scp +++ b/scp2/source/ooo/mingw_dlls.scp @@ -121,6 +121,12 @@ MINGW_DLL( gid_Brand_File_Lib_Mingw_Icudata, MINGW_ICUDATA_DLL ) #endif #endif +#ifdef SYSTEM_JPEG +#ifdef NEEDS_MINGW_JPEG_DLL +MINGW_DLL( gid_Brand_File_Lib_Mingw_Jpeg, MINGW_JPEG_DLL ) +#endif +#endif + #ifdef SYSTEM_GRAPHITE #ifdef NEEDS_MINGW_GRAPHITE2_DLL MINGW_DLL( gid_Brand_File_Lib_Mingw_Libgrahpite, MINGW_GRAPHITE2_DLL ) commit 9339da8659d0807bb8306a670facacc55821aca0 Author: David Tardon dtar...@redhat.com Date: Mon Mar 19 09:10:06 2012 +0100 mingw: check for system iconv dll libxslt in Fedora mingw packages depends on it. diff --git a/config_host.mk.in b/config_host.mk.in index 050417e..002ff8e 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -292,6 +292,7 @@ export MINGW_GRAPHITE2_DLL=@MINGW_GRAPHITE2_DLL@ export MINGW_GXXDLL=@MINGW_GXXDLL@ export MINGW_HUNSPELL_DLL=@MINGW_HUNSPELL_DLL@ export MINGW_HYPHEN_DLL=@MINGW_HYPHEN_DLL@ +export MINGW_ICONV_DLL=@MINGW_ICONV_DLL@ export MINGW_ICUDATA_DLL=@MINGW_ICUDATA_DLL@ export MINGW_ICUI18N_DLL=@MINGW_ICUI18N_DLL@ export MINGW_ICUUC_DLL=@MINGW_ICUUC_DLL@ diff --git a/configure.in b/configure.in index 65200c8..68a0e3b 100644 --- a/configure.in +++ b/configure.in @@ -6034,6 +6034,7 @@ if test $with_system_libxml = yes; then fi libo_MINGW_CHECK_DLL([LIBXSLT], [libxslt]) +libo_MINGW_TRY_DLL([ICONV], [iconv]) else AC_MSG_RESULT([internal]) SYSTEM_LIBXSLT=NO @@ -6056,6 +6057,7 @@ AC_SUBST(LIBXSLT_CFLAGS) AC_SUBST(LIBXSLT_LIBS) AC_SUBST(XSLTPROC) AC_SUBST([MINGW_LIBXSLT_DLL]) +AC_SUBST([MINGW_ICONV_DLL]) # === # Check for system libxml diff --git a/external/mingw-dlls/makefile.mk b/external/mingw-dlls/makefile.mk index d312c34..bc64b27 100644 --- a/external/mingw-dlls/makefile.mk +++ b/external/mingw-dlls/makefile.mk @@ -55,6 +55,7 @@ MINGW_DLLS:= \ $(MINGW_GRAPHITE2_DLL) \ $(MINGW_HUNSPELL_DLL) \ $(MINGW_HYPHEN_DLL) \ +$(MINGW_ICONV_DLL) \ $(MINGW_ICUDATA_DLL) \ $(MINGW_ICUI18N_DLL) \
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - pyuno/source
pyuno/source/module/pyuno.cxx | 19 +++
1 file changed, 15 insertions(+), 4 deletions(-)
New commits:
commit 8d7726c6a54cd65700f4d3183baef7800aaeced5
Author: David Bolen db3l@gmail.com
Date: Fri Mar 16 22:10:24 2012 +0100
fdo#46926: PyUNO_cmp: return acquired reference
(cherry picked from commit 742dca7366ba6ac3c58b1df6ee548788f4ce24e7)
Signed-off-by: Miklos Vajna vmik...@suse.cz
diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
index 7f5f0b5..b712ae4 100644
--- a/pyuno/source/module/pyuno.cxx
+++ b/pyuno/source/module/pyuno.cxx
@@ -595,6 +595,8 @@ int PyUNO_setattr (PyObject* self, char* name, PyObject*
value)
// ensure object identity and struct equality
static PyObject* PyUNO_cmp( PyObject *self, PyObject *that, int op )
{
+PyObject *result;
+
if(op != Py_EQ op != Py_NE)
{
PyErr_SetString(PyExc_TypeError, only '==' and '!=' comparisions are
defined);
@@ -602,7 +604,9 @@ static PyObject* PyUNO_cmp( PyObject *self, PyObject *that,
int op )
}
if( self == that )
{
-return (op == Py_EQ ? Py_True : Py_False);
+result = (op == Py_EQ ? Py_True : Py_False);
+Py_INCREF(result);
+return result;
}
try
{
@@ -624,14 +628,18 @@ static PyObject* PyUNO_cmp( PyObject *self, PyObject
*that, int op )
Reference XMaterialHolder xOther(
other-members-xInvocation,UNO_QUERY );
if( xMe-getMaterial() == xOther-getMaterial() )
{
-return (op == Py_EQ ? Py_True : Py_False);
+result = (op == Py_EQ ? Py_True : Py_False);
+Py_INCREF(result);
+return result;
}
}
else if( tcMe == com::sun::star::uno::TypeClass_INTERFACE )
{
if( me-members-wrappedObject ==
other-members-wrappedObject )
{
-return (op == Py_EQ ? Py_True : Py_False);
+result = (op == Py_EQ ? Py_True : Py_False);
+Py_INCREF(result);
+return result;
}
}
}
@@ -641,7 +649,10 @@ static PyObject* PyUNO_cmp( PyObject *self, PyObject
*that, int op )
{
raisePyExceptionWithAny( makeAny( e ) );
}
-return (op == Py_EQ ? Py_False : Py_True);
+
+result = (op == Py_EQ ? Py_False : Py_True);
+Py_INCREF(result);
+return result;
}
/* Python 2 has a tp_flags value for rich comparisons. Python 3 does not (on
by default) */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/inc
sc/inc/dpnumgroupinfo.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f21960f3b34480ac1d81432ec599b7a6820adf01 Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Mar 19 10:40:48 2012 +0200 Mark also the copy constructor as SC_DLLPUBLIC, needed by the scfilt library diff --git a/sc/inc/dpnumgroupinfo.hxx b/sc/inc/dpnumgroupinfo.hxx index 2e0196d..9d6f254 100644 --- a/sc/inc/dpnumgroupinfo.hxx +++ b/sc/inc/dpnumgroupinfo.hxx @@ -43,7 +43,7 @@ struct ScDPNumGroupInfo double mfStep; SC_DLLPUBLIC ScDPNumGroupInfo(); -ScDPNumGroupInfo(const ScDPNumGroupInfo r); +SC_DLLPUBLIC ScDPNumGroupInfo(const ScDPNumGroupInfo r); }; #endif ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 4fa48a11902791a7dbcae947b172ca3bb3e82b33
Author: Tor Lillqvist tlillqv...@suse.com
Date: Mon Mar 19 10:50:27 2012 +0200
Do AC_PROG_EGREP before using $GREP
diff --git a/configure.in b/configure.in
index 055e061..694b32e 100644
--- a/configure.in
+++ b/configure.in
@@ -61,6 +61,8 @@ else
fi
AC_SUBST(CROSS_COMPILING)
+AC_PROG_EGREP
+
if test $build_os = cygwin; then
EXEEXT_FOR_BUILD=.exe
SRC_ROOT=`pwd`
@@ -1976,7 +1978,6 @@ AC_ARG_WITH(system-libxml-for-build,
dnl ===
dnl check for required programs (grep, awk, sed, bash)
dnl ===
-AC_PROG_EGREP
pathmunge ()
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/ooo/mingw_dlls.scp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c08e789d3a6449e4abf946b77894a72aedd1dc53 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Mar 19 09:52:31 2012 +0100 Copy/paste typo diff --git a/scp2/source/ooo/mingw_dlls.scp b/scp2/source/ooo/mingw_dlls.scp index 8a3098f..6d50c32 100644 --- a/scp2/source/ooo/mingw_dlls.scp +++ b/scp2/source/ooo/mingw_dlls.scp @@ -51,7 +51,7 @@ MINGW_DLL( gid_Brand_File_Lib_Mingw_Libexpat, MINGW_EXPAT_DLL ) MINGW_DLL( gid_Brand_File_Lib_Mingw_Libxslt, MINGW_LIBXSLT_DLL ) #endif #ifdef NEEDS_MINGW_ICONV_DLL -MINGW_DLL( gid_Brand_File_Lib_Mingw_Libxslt, MINGW_ICONV_DLL ) +MINGW_DLL( gid_Brand_File_Lib_Mingw_Iconv, MINGW_ICONV_DLL ) #endif #endif ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/qa
sw/qa/extras/rtftok/data/n751020.rtf |8
sw/qa/extras/rtftok/rtftok.cxx | 15 +++
2 files changed, 23 insertions(+)
New commits:
commit 9415e8c6c3089be3c4c78e3878163eda3e2bd873
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Mar 19 10:45:28 2012 +0100
testcase for n#751020
diff --git a/sw/qa/extras/rtftok/data/n751020.rtf
b/sw/qa/extras/rtftok/data/n751020.rtf
new file mode 100644
index 000..66175cf
--- /dev/null
+++ b/sw/qa/extras/rtftok/data/n751020.rtf
@@ -0,0 +1,8 @@
+{\rtf1
+{\stylesheet
+{Normal;}
+}
+\linkstyles
+first\par
+second\par
+}
diff --git a/sw/qa/extras/rtftok/rtftok.cxx b/sw/qa/extras/rtftok/rtftok.cxx
index c376779..7483634 100644
--- a/sw/qa/extras/rtftok/rtftok.cxx
+++ b/sw/qa/extras/rtftok/rtftok.cxx
@@ -67,6 +67,7 @@ public:
void testN750757();
void testFdo45563();
void testFdo43965();
+void testN751020();
CPPUNIT_TEST_SUITE(RtfModelTest);
#if !defined(MACOSX) !defined(WNT)
@@ -80,6 +81,7 @@ public:
CPPUNIT_TEST(testN750757);
CPPUNIT_TEST(testFdo45563);
CPPUNIT_TEST(testFdo43965);
+CPPUNIT_TEST(testN751020);
#endif
CPPUNIT_TEST_SUITE_END();
@@ -374,6 +376,19 @@ void RtfModelTest::testFdo43965()
CPPUNIT_ASSERT_EQUAL(sal_Int16(2), xCursor-getPage());
}
+void RtfModelTest::testN751020()
+{
+load(OUString(RTL_CONSTASCII_USTRINGPARAM(n751020.rtf)));
+uno::Referencetext::XTextDocument xTextDocument(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XEnumerationAccess
xParaEnumAccess(xTextDocument-getText(), uno::UNO_QUERY);
+uno::Referencecontainer::XEnumeration xParaEnum =
xParaEnumAccess-createEnumeration();
+CPPUNIT_ASSERT(xParaEnum-hasMoreElements());
+uno::Referencebeans::XPropertySet xPropertySet(xParaEnum-nextElement(),
uno::UNO_QUERY);
+sal_Int32 nValue = 0;
+
xPropertySet-getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ParaBottomMargin)))
= nValue;
+CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(200)), nValue);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(RtfModelTest);
CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: instsetoo_native/util
instsetoo_native/util/makefile.mk | 24 1 file changed, 16 insertions(+), 8 deletions(-) New commits: commit 5a6e8707c2753d8f654e7b04c04f4609ffab52fc Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Mar 19 12:29:44 2012 +0200 Don't build helppack installers if --without-help Or should it be --without-helppack-integration that affects it? Or both? Why do we need both these switches? And what does that irritating integration thing mean again? Does --without-helppack-integration mean yes, do build helppacks, but don't integrate them? diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index 04acba4..71e9184 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -74,6 +74,14 @@ LOCALPYFILES= \ $(BIN)$/pythonloader.py .ENDIF +.IF $(BUILD_TYPE)==$(BUILD_TYPE:s/HELP//) +OOOHELPPACK= +OOODEVHELPPACK= +.ELSE +OOOHELPPACK=ooohelppack +OOODEVHELPPACK=ooodevhelppack +.ENDIF + help_exist:=$(shell @find $(L10N_MODULE)/source/ -type d -name helpcontent2 2/dev/null | sed -e s|/helpcontent2|| -e s|^.*/|| ) en-US qtz # do not build key is pseudolanguage for release builds @@ -93,29 +101,29 @@ ALLTAR : $(LOCALPYFILES) .IF $(ENABLE_RELEASE_BUILD)==TRUE .IF $(BUILD_TYPE)==$(BUILD_TYPE:s/ODK//) .IF $(GUI)==WNT -ALLTAR : openofficeall ooohelppack +ALLTAR : openofficeall $(OOOHELPPACK) .ELSE -ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) ooohelppack) $(eq,$(OS),MACOSX $(NULL) lotest_en-US) +ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) $(OOOHELPPACK)) $(eq,$(OS),MACOSX $(NULL) lotest_en-US) .ENDIF .ELSE .IF $(GUI)==WNT -ALLTAR : openofficeall ooohelppack sdkooall +ALLTAR : openofficeall $(OOOHELPPACK) sdkooall .ELSE -ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) ooohelppack) $(eq,$(OS),MACOSX $(NULL) lotest_en-US) sdkoo_en-US +ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) $(OOOHELPPACK)) $(eq,$(OS),MACOSX $(NULL) lotest_en-US) sdkoo_en-US .ENDIF .ENDIF .ELSE # $(ENABLE_RELEASE_BUILD)==TRUE .IF $(BUILD_TYPE)==$(BUILD_TYPE:s/ODK//) .IF $(GUI)==WNT -ALLTAR : openofficedevall ooodevhelppack +ALLTAR : openofficedevall $(OOODEVHELPPACK) .ELSE -ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $(NULL) ooodevhelppack) $(eq,$(OS),MACOSX $(NULL) lodevtest_en-US) +ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $(NULL) $(OOODEVHELPPACK)) $(eq,$(OS),MACOSX $(NULL) lodevtest_en-US) .ENDIF .ELSE .IF $(GUI)==WNT -ALLTAR : openofficedevall ooodevhelppack sdkoodevall +ALLTAR : openofficedevall $(OOODEVHELPPACK) sdkoodevall .ELSE -ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $(NULL) ooodevhelppack) $(eq,$(OS),MACOSX $(NULL) lodevtest_en-US) sdkoodev_en-US +ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $(NULL) $(OOODEVHELPPACK)) $(eq,$(OS),MACOSX $(NULL) lodevtest_en-US) sdkoodev_en-US .ENDIF .ENDIF .ENDIF # $(ENABLE_RELEASE_BUILD)==TRUE ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - svtools/source
svtools/source/misc/templatefoldercache.cxx | 11 +++
1 file changed, 11 insertions(+)
New commits:
commit ec752de623f4f7c7e297422730f193034e21f93f
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Mar 16 14:57:51 2012 +0100
fdo#37593 Make sure needsUpdate compares canonicalized paths
...so that it does not erroneously always claim an update is needed, so that
SvtDocumentTemplateDialog::UpdateHdl_Impl does not always jump back to
OpenTemplateRoot() shortly after opening the dialog (and thus jumps away
from
the last remembered folder).
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/svtools/source/misc/templatefoldercache.cxx
b/svtools/source/misc/templatefoldercache.cxx
index 41f0af0..d5325f4 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.cxx
@@ -695,6 +695,17 @@ namespace svt
{
String sTemplatePath( aDirs.GetToken( i, ';' ) );
sTemplatePath = aPathOptions.ExpandMacros( sTemplatePath );
+
+// Make sure excess .. path segments (from expanding bootstrap
+// variables in paths) are normalized in the same way they are
+// normalized for paths read from the .templdir.cache file (where
+// paths have gone through makeRelocatable URL on writing out and
+// then through makeAbsoluteURL when reading back in), as otherwise
+// equalStates() in needsUpdate() could erroneously consider
+// m_aCurrentState and m_aPreviousState as different:
+sTemplatePath = getOfficeInstDirs()-makeAbsoluteURL(
+getOfficeInstDirs()-makeRelocatableURL(sTemplatePath));
+
// create a new entry
m_aCurrentState.push_back( new TemplateContent( INetURLObject(
sTemplatePath ) ) );
TemplateFolderContent::iterator aCurrentRoot =
m_aCurrentState.end();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - readlicense_oo/html readlicense_oo/odt readlicense_oo/txt
readlicense_oo/html/THIRDPARTYLICENSEREADME.html | 65 +++ readlicense_oo/odt/LICENSE.odt |binary readlicense_oo/txt/license.txt | 65 +++ 3 files changed, 130 insertions(+) New commits: commit b234cf6e5478120bc1e8c66b2b91de0387774b0c Author: Andras Timar ati...@suse.com Date: Sun Mar 18 11:47:27 2012 +0100 update of license document added Info-ZIP lincense Signed-off-by: Michael Meeks michael.me...@suse.com diff --git a/readlicense_oo/html/THIRDPARTYLICENSEREADME.html b/readlicense_oo/html/THIRDPARTYLICENSEREADME.html index 45a5c27..d9c29b7 100644 --- a/readlicense_oo/html/THIRDPARTYLICENSEREADME.html +++ b/readlicense_oo/html/THIRDPARTYLICENSEREADME.html @@ -2611,6 +2611,71 @@ be misrepresented as being the original software./P P CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 0.3cm3. This notice may not be removed or altered from any source distribution./P +P LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 0.3cm +LibreOffice uses unzip.c from zlib's contrib/minizip directory. This file +was derived from Info-ZIP's unzip.c, which is under the Info-ZIP License:/P +P LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 0.3cm +This is version 2007-Mar-4 of the Info-ZIP license. +The definitive version of this document should be available at +a href=ftp://ftp.info-zip.org/pub/infozip/license.html;ftp://ftp.info-zip.org/pub/infozip/license.html/a indefinitely and +a copy at a href=http://www.info-zip.org/pub/infozip/license.html;http://www.info-zip.org/pub/infozip/license.html/a./P +P LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 0.3cm +Copyright (c) 1990-2007 Info-ZIP. All rights reserved./P +P LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 0.3cm +For the purposes of this copyright and license, Info-ZIP is defined as +the following set of individuals:/P +BLOCKQUOTEP LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 0.3cm +Mark Adler, John Bush, Karl Davis, Harald Denker, Jean-Michel Dubois, +Jean-loup Gailly, Hunter Goatley, Ed Gordon, Ian Gorman, Chris Herborth, +Dirk Haase, Greg Hartwig, Robert Heath, Jonathan Hudson, Paul Kienitz, +David Kirschbaum, Johnny Lee, Onno van der Linden, Igor Mandrichenko, +Steve P. Miller, Sergio Monesi, Keith Owens, George Petrov, Greg Roelofs, +Kai Uwe Rommel, Steve Salisbury, Dave Smith, Steven M. Schweda, +Christian Spieler, Cosmin Truta, Antoine Verheijen, Paul von Behren, +Rich Wales, Mike White./P/BLOCKQUOTE +P LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 0.3cm +This software is provided as is, without warranty of any kind, express +or implied. In no event shall Info-ZIP or its contributors be held liable +for any direct, indirect, incidental, special or consequential damages +arising out of the use of or inability to use this software./P +P LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 0.3cm +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the above disclaimer and the following restrictions:/P +OL +LIP LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 0.3cm +Redistributions of source code (in whole or in part) must retain +the above copyright notice, definition, disclaimer, and this list +of conditions./P/LI +LIP LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 0.3cm +Redistributions in binary form (compiled executables and libraries) +must reproduce the above copyright notice, definition, disclaimer, +and this list of conditions in documentation and/or other materials +provided with the distribution. The sole exception to this condition +is redistribution of a standard UnZipSFX binary (including SFXWiz) as +part of a self-extracting archive; that is permitted without inclusion +of this license, as long as the normal SFX banner has not been removed +from the binary or disabled./P/LI +LIP LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 0.3cm +Altered versions--including, but not limited to, ports to new operating +systems, existing ports with new graphical interfaces, versions with +modified or added functionality, and dynamic, shared, or static library +versions not from Info-ZIP--must be plainly marked as such and must not +be misrepresented as being the original source or, if binaries, +compiled from the original source. Such altered versions also must not +be misrepresented as being Info-ZIP releases--including, but not +limited to, labeling of the altered versions with the names Info-ZIP +(or any variation thereof, including, but not limited to, different +capitalizations), Pocket UnZip, WiZ or MacZip without the +explicit permission of Info-ZIP. Such altered versions are further +prohibited from misrepresentative use of the Zip-Bugs or Info-ZIP +e-mail
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - readlicense_oo/html readlicense_oo/odt readlicense_oo/txt
readlicense_oo/html/THIRDPARTYLICENSEREADME.html | 65 +++ readlicense_oo/odt/LICENSE.odt |binary readlicense_oo/txt/license.txt | 65 +++ 3 files changed, 130 insertions(+) New commits: commit 00fb6dcf450599aece31ec8ab3a46f63eb842bac Author: Andras Timar ati...@suse.com Date: Mon Mar 19 13:26:28 2012 +0100 update of license document added Info-ZIP license Signed-off-by: Michael Meeks mme...@suse.com diff --git a/readlicense_oo/html/THIRDPARTYLICENSEREADME.html b/readlicense_oo/html/THIRDPARTYLICENSEREADME.html index c32b3a3..3e26461 100644 --- a/readlicense_oo/html/THIRDPARTYLICENSEREADME.html +++ b/readlicense_oo/html/THIRDPARTYLICENSEREADME.html @@ -2443,6 +2443,71 @@ not be misrepresented as being the original software./P P LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 0.3cm 3. This notice may not be removed or altered from any source distribution./P +P LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 0.3cm +LibreOffice uses unzip.c from zlib's contrib/minizip directory. This file +was derived from Info-ZIP's unzip.c, which is under the Info-ZIP License:/P +P LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 0.3cm +This is version 2007-Mar-4 of the Info-ZIP license. +The definitive version of this document should be available at +a href=ftp://ftp.info-zip.org/pub/infozip/license.html;ftp://ftp.info-zip.org/pub/infozip/license.html/a indefinitely and +a copy at http://www.info-zip.org/pub/infozip/license.html./P +P LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 0.3cm +Copyright (c) 1990-2007 Info-ZIP. All rights reserved./P +P LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 0.3cm +For the purposes of this copyright and license, Info-ZIP is defined as +the following set of individuals:/P +BLOCKQUOTEP LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 0.3cm +Mark Adler, John Bush, Karl Davis, Harald Denker, Jean-Michel Dubois, +Jean-loup Gailly, Hunter Goatley, Ed Gordon, Ian Gorman, Chris Herborth, +Dirk Haase, Greg Hartwig, Robert Heath, Jonathan Hudson, Paul Kienitz, +David Kirschbaum, Johnny Lee, Onno van der Linden, Igor Mandrichenko, +Steve P. Miller, Sergio Monesi, Keith Owens, George Petrov, Greg Roelofs, +Kai Uwe Rommel, Steve Salisbury, Dave Smith, Steven M. Schweda, +Christian Spieler, Cosmin Truta, Antoine Verheijen, Paul von Behren, +Rich Wales, Mike White./P/BLOCKQUOTE +P LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 0.3cm +This software is provided as is, without warranty of any kind, express +or implied. In no event shall Info-ZIP or its contributors be held liable +for any direct, indirect, incidental, special or consequential damages +arising out of the use of or inability to use this software./P +P LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 0.3cm +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the above disclaimer and the following restrictions:/P +OL +LIP LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 0.3cm +Redistributions of source code (in whole or in part) must retain +the above copyright notice, definition, disclaimer, and this list +of conditions./P/LI +LIP LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 0.3cm +Redistributions in binary form (compiled executables and libraries) +must reproduce the above copyright notice, definition, disclaimer, +and this list of conditions in documentation and/or other materials +provided with the distribution. The sole exception to this condition +is redistribution of a standard UnZipSFX binary (including SFXWiz) as +part of a self-extracting archive; that is permitted without inclusion +of this license, as long as the normal SFX banner has not been removed +from the binary or disabled./P/LI +LIP LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 0.3cm +Altered versions--including, but not limited to, ports to new operating +systems, existing ports with new graphical interfaces, versions with +modified or added functionality, and dynamic, shared, or static library +versions not from Info-ZIP--must be plainly marked as such and must not +be misrepresented as being the original source or, if binaries, +compiled from the original source. Such altered versions also must not +be misrepresented as being Info-ZIP releases--including, but not +limited to, labeling of the altered versions with the names Info-ZIP +(or any variation thereof, including, but not limited to, different +capitalizations), Pocket UnZip, WiZ or MacZip without the +explicit permission of Info-ZIP. Such altered versions are further +prohibited from misrepresentative use of the Zip-Bugs or Info-ZIP +e-mail addresses or the Info-ZIP URL(s), such as to
[Libreoffice-commits] .: lcms2/makefile.mk
lcms2/makefile.mk |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit aa7901471055a6fdb34979e630044b3ffe551d73 Author: Jan Holesovsky ke...@suse.cz Date: Mon Mar 19 13:33:26 2012 +0100 Fix libcms2 build on MinGW. diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk index 2be34b5..99ad872 100644 --- a/lcms2/makefile.mk +++ b/lcms2/makefile.mk @@ -39,7 +39,11 @@ TARGET=so_lcms2 TARFILE_NAME=lcms2-2.3 TARFILE_MD5=327348d67c979c88c2dec59a23a17d85 -PATCH_FILES = lcms2.patch lcms2-windows-export.patch +PATCH_FILES = lcms2.patch + +.IF $(CROSS_COMPILING)!=YES +PATCH_FILES += lcms2-windows-export.patch +.ENDIF .IF $(SYSTEM_LCMS2) == YES @all: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: lcms2/makefile.mk
lcms2/makefile.mk |7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) New commits: commit f3e4e3ea9424fee25ddded30247a8e884ac4bd94 Author: Jan Holesovsky ke...@suse.cz Date: Mon Mar 19 13:42:15 2012 +0100 Better check when to use the lcms2-windows-export.patch. diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk index 99ad872..ce5f2be 100644 --- a/lcms2/makefile.mk +++ b/lcms2/makefile.mk @@ -41,16 +41,15 @@ TARFILE_MD5=327348d67c979c88c2dec59a23a17d85 PATCH_FILES = lcms2.patch -.IF $(CROSS_COMPILING)!=YES -PATCH_FILES += lcms2-windows-export.patch -.ENDIF - .IF $(SYSTEM_LCMS2) == YES @all: @echo Using system littlecms2... .ENDIF .IF $(GUI)$(COM)==WNTMSC + +PATCH_FILES += lcms2-windows-export.patch + CONFIGURE_DIR=. CONFIGURE_ACTION = ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: desktop/Executable_soffice.mk
desktop/Executable_soffice.mk |1 - 1 file changed, 1 deletion(-) New commits: commit 9019ccb42398b714666f045693e503780d9746ab Author: Stephan Bergmann sberg...@redhat.com Date: Mon Mar 19 14:18:51 2012 +0100 soffice.exe must not link against sal3.dll (might fix fdo#44489) ...as soffice.exe creates the proper environment (PATH) for soffice.bin to be able to load URE libs like sal3.dll, so soffice.exe itself should neither be able to load nor depend on sal3.dll (and does not depend on anything exported by it, anyway). It is unclear to me how this ever worked (which it presumably did?) with any Windows build, either native MSVC or cross-compiled MinGW. (Maybe MSVC builds do not record a dependency from soffice.exe to sal3.dll, noting that the former does not import anything from the latter?) diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk index b169898..9ca4d3a 100644 --- a/desktop/Executable_soffice.mk +++ b/desktop/Executable_soffice.mk @@ -30,7 +30,6 @@ $(eval $(call gb_Executable_Executable,soffice)) $(eval $(call gb_Executable_set_targettype_gui,soffice,YES)) $(eval $(call gb_Executable_add_linked_libs,soffice,\ -sal \ advapi32 \ shell32 \ shlwapi \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: desktop/source
desktop/source/app/langselect.cxx |6 ++
desktop/source/app/langselect.hxx |1 -
2 files changed, 2 insertions(+), 5 deletions(-)
New commits:
commit 43061897a69fbfc765170e87588f843fbd540e52
Author: Jan Holesovsky ke...@suse.cz
Date: Mon Mar 19 14:34:35 2012 +0100
Workaround a strange wine / mingw crash.
diff --git a/desktop/source/app/langselect.cxx
b/desktop/source/app/langselect.cxx
index 7dbc4f2..387dca0 100644
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@@ -72,8 +72,6 @@ sal_Bool LanguageSelection::bFoundLanguage = sal_False;
OUString LanguageSelection::aFoundLanguage;
LanguageSelection::LanguageSelectionStatus LanguageSelection::m_eStatus =
LS_STATUS_OK;
-const OUString
LanguageSelection::usFallbackLanguage(RTL_CONSTASCII_USTRINGPARAM(en-US));
-
static sal_Bool existsURL( OUString const sURL )
{
using namespace osl;
@@ -335,11 +333,11 @@ OUString LanguageSelection::getLanguageString()
}
}
// fallback 1: en-US
-OUString usFB = usFallbackLanguage;
+OUString usFB(RTL_CONSTASCII_USTRINGPARAM(en-US));
if (isInstalledLanguage(usFB))
{
bFoundLanguage = sal_True;
-aFoundLanguage = usFallbackLanguage;
+aFoundLanguage = OUString(RTL_CONSTASCII_USTRINGPARAM(en-US));
return aFoundLanguage;
}
diff --git a/desktop/source/app/langselect.hxx
b/desktop/source/app/langselect.hxx
index 2fd8074..93b6bc4 100644
--- a/desktop/source/app/langselect.hxx
+++ b/desktop/source/app/langselect.hxx
@@ -54,7 +54,6 @@ public:
static LanguageSelectionStatus getStatus();
private:
-static const rtl::OUString usFallbackLanguage;
static rtl::OUString aFoundLanguage;
static sal_Bool bFoundLanguage;
static LanguageSelectionStatus m_eStatus;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - shell/inc shell/source zlib/prj zlib/zlib-1.2.5.patch
shell/inc/internal/basereader.hxx |2
shell/inc/internal/contentreader.hxx |3
shell/inc/internal/metainforeader.hxx |2
shell/inc/internal/stream_helper.hxx | 24
shell/inc/internal/types.hxx | 17
shell/inc/internal/zipfile.hxx| 29
shell/source/win32/ooofilereader/basereader.cxx |4
shell/source/win32/ooofilereader/contentreader.cxx|4
shell/source/win32/ooofilereader/metainforeader.cxx |4
shell/source/win32/shlxthandler/makefile.mk |2
shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx | 11
shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx |2
shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx | 190 ++---
shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx |5
shell/source/win32/zipfile/zipfile.cxx| 473 +++---
zlib/prj/d.lst|2
zlib/zlib-1.2.5.patch | 10
17 files changed, 550 insertions(+), 234 deletions(-)
New commits:
commit e515cc938e21dd033d7e36440e20eb7cf561c293
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Mon Mar 19 15:22:04 2012 +0100
Don't build unnecessary files
diff --git a/zlib/prj/d.lst b/zlib/prj/d.lst
index dc223ae..4f4996b 100644
--- a/zlib/prj/d.lst
+++ b/zlib/prj/d.lst
@@ -3,8 +3,6 @@ mkdir: %_DEST%\lib\x64
..\%__SRC%\inc\patched\zlib.h %_DEST%\inc\external\zlib\zlib.h
..\%__SRC%\inc\unzip.h %_DEST%\inc\external\zlib\unzip.h
-..\%__SRC%\inc\ioapi.h %_DEST%\inc\external\zlib\ioapi.h
-..\%__SRC%\inc\zconf.h %_DEST%\inc\external\zlib\zconf.h
..\%__SRC%\lib\libzlib.a %_DEST%\lib\libzlib.a
..\%__SRC%\slb\zlib.lib %_DEST%\lib\zlib.lib
diff --git a/zlib/zlib-1.2.5.patch b/zlib/zlib-1.2.5.patch
index 7021a2c..3389b88 100644
--- a/zlib/zlib-1.2.5.patch
+++ b/zlib/zlib-1.2.5.patch
@@ -1,6 +1,6 @@
--- misc/zlib-1.2.5/makefile.mkFri Mar 14 10:17:06 2008
+++ misc/build/zlib-1.2.5/makefile.mk Fri Mar 14 10:16:56 2008
-@@ -1 +1,67 @@
+@@ -1 +1,63 @@
-dummy
+#*
+#
@@ -31,9 +31,7 @@
+ $(SLO)$/inflate.obj \
+ $(SLO)$/inftrees.obj\
+ $(SLO)$/trees.obj \
-+ $(SLO)$/zutil.obj \
-+ $(SLO)$/unzip.obj \
-+ $(SLO)$/ioapi.obj
++ $(SLO)$/zutil.obj
+
+
+LIB1TARGET=$(SLB)$/$(TARGET).lib
@@ -49,9 +47,7 @@
+ $(SLO_X64)$/inflate.obj \
+ $(SLO_X64)$/inftrees.obj\
+ $(SLO_X64)$/trees.obj \
-+ $(SLO_X64)$/zutil.obj \
-+ $(SLO_X64)$/unzip.obj \
-+ $(SLO_X64)$/ioapi.obj
++ $(SLO_X64)$/zutil.obj
+
+LIB1TARGET_X64=$(SLB_X64)$/$(TARGET).lib
+LIB1OBJFILES_X64=$(SLOFILES_X64)
commit 04366df3bca16d4e0cbe254551e44427ae6338bb
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Mon Mar 19 15:09:34 2012 +0100
Simple Zip file-format implementation to avoid the need of minizip
diff --git a/shell/inc/internal/basereader.hxx
b/shell/inc/internal/basereader.hxx
index bb5c276..7a15410 100644
--- a/shell/inc/internal/basereader.hxx
+++ b/shell/inc/internal/basereader.hxx
@@ -46,7 +46,7 @@ public:
protected: // protected because its only an implementation relevant class
CBaseReader( const std::string DocumentName );
-CBaseReader( void* stream, zlib_filefunc_def* fa );
+CBaseReader( StreamInterface *stream );
virtual void start_document();
diff --git a/shell/inc/internal/contentreader.hxx
b/shell/inc/internal/contentreader.hxx
index 6a7dc59..e55a760 100644
--- a/shell/inc/internal/contentreader.hxx
+++ b/shell/inc/internal/contentreader.hxx
@@ -32,6 +32,7 @@
#include internal/basereader.hxx
class ITag;
+class StreamInterface;
class CContentReader : public CBaseReader
{
@@ -40,7 +41,7 @@ public:
CContentReader( const std::string DocumentName, LocaleSet_t const
DocumentLocale );
-CContentReader( void* stream, LocaleSet_t const DocumentLocale,
zlib_filefunc_def* fa );
+CContentReader( StreamInterface* stream, LocaleSet_t const
DocumentLocale );
/** Get the chunkbuffer.
diff --git a/shell/inc/internal/metainforeader.hxx
b/shell/inc/internal/metainforeader.hxx
index 5162245..a0ed7d9 100644
--- a/shell/inc/internal/metainforeader.hxx
+++ b/shell/inc/internal/metainforeader.hxx
@@ -44,7 +44,7 @@ public:
CMetaInfoReader( const std::string DocumentName );
-CMetaInfoReader( void* stream, zlib_filefunc_def* fa);
+CMetaInfoReader( StreamInterface* stream );
/**
[Libreoffice-commits] .: README.cross
README.cross |9 + 1 file changed, 9 insertions(+) New commits: commit e0c17f41a59ae395e4fca928350ec3eb6d9be723 Author: Jan Holesovsky ke...@suse.cz Date: Mon Mar 19 15:27:25 2012 +0100 How to examine strings in winedbg. diff --git a/README.cross b/README.cross index 818c335..3567a69 100644 --- a/README.cross +++ b/README.cross @@ -208,6 +208,15 @@ $ winedbg soffice.bin Would be great to be able to use winedbg --gdb, but it was crashing here :-( - but maybe you'll be more lucky. +Tricks of some use with winedbg: + + +To examine OUStrings, you might want to use the following trick (prints 50 +unicode characters of rLibName OUString - the +10 is where the buffer starts): + +Wine-dbgx /50u rLibName-pData+10 +0x0909b6c8: vnd.sun.star.expand:$LO_LIB_DIR/abplo.dll + TODO: - installation ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/linkoo |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 6850bd15228eb496ba62fa08ef4f628336d63898
Author: Jan Holesovsky ke...@suse.cz
Date: Mon Mar 19 15:35:23 2012 +0100
Improve linkoo for MinGW.
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 97ae2e3..daef867 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -113,7 +113,8 @@ my $brand_program_dir = 'program';
my $ure_lib_dir = 'ure-link/lib';
my $win_ure_lib_dir = 'URE/bin';
-my @exceptions = ( 'cppuhelper', 'libsunjavaplugin', 'libjvmfwk' );
+my @exceptions = ( 'libsunjavaplugin', 'libjvmfwk' );
+push @exceptions, 'cppuhelper' if ($TARGET ne 'wntgcci.pro');
my $bin;
$bin = |\\.bin if ($TARGET eq 'wntgcci.pro');
@@ -419,6 +420,8 @@ if (!-f $OOO_INSTALL/ . $brand_program_dir . /ooenv) {
evilness ('do');
-print \nlinkoo finished, please don't forget to source ooenv before
./soffice.\n;
+print \nlinkoo finished;
+print , please don't forget to source ooenv before ./soffice. if ($TARGET ne
'wntgcci.pro');
+print \n;
# vim:set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: zlib/prj
zlib/prj/d.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e1b8187d598cba25503f9c56740eb6109b2c355c Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Mar 19 15:44:46 2012 +0100 OOps diff --git a/zlib/prj/d.lst b/zlib/prj/d.lst index 4f4996b..ef40caf 100644 --- a/zlib/prj/d.lst +++ b/zlib/prj/d.lst @@ -2,7 +2,7 @@ mkdir: %_DEST%\inc\external\zlib mkdir: %_DEST%\lib\x64 ..\%__SRC%\inc\patched\zlib.h %_DEST%\inc\external\zlib\zlib.h -..\%__SRC%\inc\unzip.h %_DEST%\inc\external\zlib\unzip.h +..\%__SRC%\inc\zconf.h %_DEST%\inc\external\zlib\zconf.h ..\%__SRC%\lib\libzlib.a %_DEST%\lib\libzlib.a ..\%__SRC%\slb\zlib.lib %_DEST%\lib\zlib.lib ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/tubes' - configure.in
configure.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e1275695fc77fccf9c82467e218f75017693f1d0 Author: Michael Meeks michael.me...@suse.com Date: Mon Mar 19 15:29:07 2012 + expand pkg_config flags for telepathy diff --git a/configure.in b/configure.in index ff2c3b3..418e751 100644 --- a/configure.in +++ b/configure.in @@ -8369,7 +8369,7 @@ AC_MSG_CHECKING([whether to enable Telepathy support]) if test $_os != WINNT -a $_os != Darwin -a $enable_telepathy = yes; then ENABLE_TELEPATHY=TRUE AC_MSG_RESULT([yes]) -PKG_CHECK_MODULES( TELEPATHY, telepathy-glib = 0.16.4 ) +PKG_CHECK_MODULES( TELEPATHY, telepathy-glib = 0.16.4 glib-2.0 gobject-2.0 gthread-2.0 dbus-1 dbus-1-glib ) else AC_MSG_RESULT([no]) fi ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/tubes' - configure.in
configure.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit dbd5bd87ee8823eed55e2ddce766b86d7a9f4ecd Author: Michael Meeks michael.me...@suse.com Date: Mon Mar 19 15:35:35 2012 + and get the pkg_config package name right diff --git a/configure.in b/configure.in index 418e751..af324fc 100644 --- a/configure.in +++ b/configure.in @@ -8369,7 +8369,7 @@ AC_MSG_CHECKING([whether to enable Telepathy support]) if test $_os != WINNT -a $_os != Darwin -a $enable_telepathy = yes; then ENABLE_TELEPATHY=TRUE AC_MSG_RESULT([yes]) -PKG_CHECK_MODULES( TELEPATHY, telepathy-glib = 0.16.4 glib-2.0 gobject-2.0 gthread-2.0 dbus-1 dbus-1-glib ) +PKG_CHECK_MODULES( TELEPATHY, telepathy-glib = 0.16.4 glib-2.0 gobject-2.0 gthread-2.0 dbus-1 dbus-glib-1 ) else AC_MSG_RESULT([no]) fi ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - desktop/source .gitignore ucb/source
.gitignore |5 -
desktop/source/deployment/manager/dp_manager.cxx | 84 ---
ucb/source/ucp/file/shell.cxx|4 +
3 files changed, 48 insertions(+), 45 deletions(-)
New commits:
commit 5eceb03e2b756595d83550a6d662d789aec83e90
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Sat Feb 18 18:40:42 2012 -0600
do not hide patch-related file (.orig .rej)
If you want to hide them, add the rule in you local git set-up.
see git config --global core.excludesfiles fo more info
Signed-off-by: Stephan Bergmann sberg...@redhat.com
diff --git a/.gitignore b/.gitignore
index caf15fb..5999b94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,7 +45,6 @@
/aclocal.m4
/autom4te.cache
/autogen.lastrun
-/build_env
/ChangeLog
/config.guess
/config.log
@@ -119,10 +118,6 @@ test/user-template/user/psprint/pspfontcache
# LibreOffice lock files
.~lock.*#
-# Everyone loves patching
-*.orig
-*.rej
-
# Somepeople love debugging
gdbtrace.log
valgrind.log
commit c6e22c0fc0cc4ce1508f8401c4b0c14fc89df942
Author: Michael Meeks michael.me...@suse.com
Date: Mon Mar 19 16:31:36 2012 +0100
fdo#40607 - osl_syncFile having written, and avoid doing that on start
Combinded cherry-pick of master d3192948fe968fc4d6a8ec0e6fda232f265b3c4c
plus subsequent fixes bee742eb7a0d5dfe23e61d9ee49a29286de90256 Fix sense
of r/o detection code, and clean up and
61eeb689d7605a23c3e71c652b57ee65cf5b28dc fix smoketest - need to check
read-only-ness of non-existent paths.
Signed-off-by: Stephan Bergmann sberg...@redhat.com
diff --git a/desktop/source/deployment/manager/dp_manager.cxx
b/desktop/source/deployment/manager/dp_manager.cxx
index 508d6bb..19117ab 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -32,6 +32,7 @@
#include dp_platform.hxx
#include dp_manager.h
#include dp_identifier.hxx
+#include rtl/oustringostreaminserter.hxx
#include rtl/ustrbuf.hxx
#include rtl/string.hxx
#include rtl/uri.hxx
@@ -312,6 +313,42 @@ void PackageManagerImpl::initRegistryBackends()
m_xComponentContext ) );
}
+// this overcomes previous rumours that the sal API is misleading
+// as to whether a directory is truly read-only or not
+static bool isMacroURLReadOnly( const OUString rMacro )
+{
+rtl::OUString aDirURL( rMacro );
+::rtl::Bootstrap::expandMacros( aDirURL );
+
+::osl::FileBase::RC aErr = ::osl::Directory::create( aDirURL );
+if ( aErr == ::osl::FileBase::E_None )
+return false; // it will be writeable
+if ( aErr != ::osl::FileBase::E_EXIST )
+return true; // some serious problem creating it
+
+bool bError;
+sal_uInt64 nWritten = 0;
+rtl::OUString aFileURL(
+aDirURL + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(/stamp.sys)) );
+::osl::File aFile( aFileURL );
+
+bError = aFile.open( osl_File_OpenFlag_Read |
+ osl_File_OpenFlag_Write |
+ osl_File_OpenFlag_Create ) != ::osl::FileBase::E_None;
+if (!bError)
+bError = aFile.write( 1, 1, nWritten ) != ::osl::FileBase::E_None;
+if (aFile.close() != ::osl::FileBase::E_None)
+bError = true;
+if (osl::File::remove( aFileURL ) != ::osl::FileBase::E_None)
+bError = true;
+
+SAL_INFO(
+desktop.deployment,
+local url ' rMacro ' - ' aFileURL '
+ (bError ? is : is not) readonly\n);
+return bError;
+}
+
//__
Referencedeployment::XPackageManager PackageManagerImpl::create(
ReferenceXComponentContext const xComponentContext,
@@ -321,7 +358,7 @@ Referencedeployment::XPackageManager
PackageManagerImpl::create(
xComponentContext, context );
Referencedeployment::XPackageManager xPackageManager( that );
-OUString packages, logFile, stampURL;
+OUString packages, logFile, stamp;
if (context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(user) )) {
that-m_activePackages = OUSTR(
vnd.sun.star.expand:$UNO_USER_PACKAGES_CACHE/uno_packages);
@@ -342,8 +379,7 @@ Referencedeployment::XPackageManager
PackageManagerImpl::create(
//using virtualization it appears that he/she can. Then a shared
extension can
//be installed but is only visible for the user (because the extension
is in
//the virtual store).
-stampURL = OUSTR(
-vnd.sun.star.expand:$UNO_USER_PACKAGES_CACHE/stamp.sys);
+stamp = OUSTR($UNO_USER_PACKAGES_CACHE);
}
else if (context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(shared) )) {
that-m_activePackages = OUSTR(
@@ -354,8 +390,7 @@ Referencedeployment::XPackageManager
PackageManagerImpl::create(
vnd.sun.star.expand:$SHARED_EXTENSIONS_USER/registry);
logFile = OUSTR(
[Libreoffice-commits] .: desktop/source
desktop/source/splash/services_spl.cxx | 92 -
desktop/source/splash/splash.cxx | 114 +--
desktop/source/splash/splash.hxx | 118 ++---
3 files changed, 129 insertions(+), 195 deletions(-)
New commits:
commit 5bda84a2d7d135ed099fc87c10bf9d3a2758b44f
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Mar 19 19:36:44 2012 +0100
Fixed spl_component_getFactory
The old code relied on the order of initializing global static variables
across
compilation units, which failed for MinGW cross compilation. Cleaned up.
diff --git a/desktop/source/splash/services_spl.cxx
b/desktop/source/splash/services_spl.cxx
index 0dc412c..5cc0bcf 100644
--- a/desktop/source/splash/services_spl.cxx
+++ b/desktop/source/splash/services_spl.cxx
@@ -26,92 +26,32 @@
*
/
-#include com/sun/star/beans/NamedValue.hpp
-#include com/sun/star/registry/XRegistryKey.hpp
-#include com/sun/star/util/Date.hpp
-#include uno/environment.h
-#include cppuhelper/factory.hxx
-#include unotools/configmgr.hxx
+#include sal/config.h
-#include splash.hxx
-
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::registry;
-using namespace ::desktop;
+#include cppuhelper/factory.hxx
+#include cppuhelper/implementationentry.hxx
+#include sal/types.h
-using ::rtl::OUString;
-
-static const char* pServices[] =
-{
-SplashScreen::serviceName,
-NULL
-};
-
-static const char* pImplementations[] =
-{
-SplashScreen::implementationName,
-NULL
-};
+#include splash.hxx
-typedef ReferenceXInterface(* fProvider)(const
ReferenceXMultiServiceFactory);
+namespace {
-static const fProvider pInstanceProviders[] =
-{
-SplashScreen::getInstance,
-NULL
-};
+namespace css = com::sun::star;
-static const char** pSupportedServices[] =
-{
-SplashScreen::interfaces,
-NULL
+static cppu::ImplementationEntry const services[] = {
+{ desktop::splash::create, desktop::splash::getImplementationName,
+ desktop::splash::getSupportedServiceNames,
+ cppu::createSingleComponentFactory, 0, 0 },
+{ 0, 0, 0, 0, 0, 0 }
};
-static SequenceOUString
-getSupportedServiceNames(int p) {
-const char **names = pSupportedServices[p];
-SequenceOUString aSeq;
-for(int i = 0; names[i] != NULL; i++) {
-aSeq.realloc(i+1);
-aSeq[i] = OUString::createFromAscii(names[i]);
-}
-return aSeq;
}
-extern C
-{
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL spl_component_getFactory(
-const sal_Char* pImplementationName,
-void* pServiceManager,
-void*)
+extern C SAL_DLLPUBLIC_EXPORT void * SAL_CALL spl_component_getFactory(
+char const * pImplName, void * pServiceManager, void * pRegistryKey)
{
-// Set default return value for this operation - if it failed.
-if ( pImplementationName pServiceManager )
-{
-Reference XSingleServiceFactory xFactory;
-Reference XMultiServiceFactory xServiceManager(
-reinterpret_cast XMultiServiceFactory* ( pServiceManager ) ) ;
-
-// search implementation
-for (int i = 0; (pImplementations[i]!=NULL); i++) {
-if ( strcmp(pImplementations[i], pImplementationName ) == 0 ) {
-// found implementation
-xFactory =
ReferenceXSingleServiceFactory(cppu::createSingleFactory(
-xServiceManager,
OUString::createFromAscii(pImplementationName),
-pInstanceProviders[i], getSupportedServiceNames(i)));
-if ( xFactory.is() ) {
-// Factory is valid - service was found.
-xFactory-acquire();
-return xFactory.get();
-}
-}
-} // for()
-}
-// Return with result of this operation.
-return NULL;
+return cppu::component_getFactoryHelper(
+pImplName, pServiceManager, pRegistryKey, services);
}
-} // extern C
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index 8773f1a..eaa6d07 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -35,24 +35,99 @@
#include vcl/svapp.hxx
#include vcl/salnativewidgets.hxx
+#include com/sun/star/lang/XInitialization.hpp
#include com/sun/star/registry/XRegistryKey.hpp
+#include com/sun/star/task/XStatusIndicator.hpp
+#include cppuhelper/implbase2.hxx
#include rtl/bootstrap.hxx
#include rtl/logfile.hxx
#include rtl/locale.hxx
#include rtl/strbuf.hxx
#include rtl/math.hxx
#include vcl/graph.hxx
+#include vcl/introwin.hxx
+#include vcl/virdev.hxx
#include svtools/filter.hxx
#define NOT_LOADED ((long)-1)
using namespace ::rtl;
+using namespace ::com::sun::star::lang;
using
[Libreoffice-commits] .: shell/source
shell/source/win32/shlxthandler/util/iso8601_converter.cxx |4 1 file changed, 4 insertions(+) New commits: commit 101aa287fd64b5f229c5dd759de353721bc2f04a Author: Stephan Bergmann sberg...@redhat.com Date: Mon Mar 19 19:45:54 2012 +0100 Missing include diff --git a/shell/source/win32/shlxthandler/util/iso8601_converter.cxx b/shell/source/win32/shlxthandler/util/iso8601_converter.cxx index e035481..4ab060c 100644 --- a/shell/source/win32/shlxthandler/util/iso8601_converter.cxx +++ b/shell/source/win32/shlxthandler/util/iso8601_converter.cxx @@ -26,6 +26,10 @@ * / +#include sal/config.h + +#include stdlib.h + #include internal/iso8601_converter.hxx #include internal/utilities.hxx ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/ui/app/transobj.cxx |3 ---
sc/source/ui/docshell/impex.cxx | 20 ++--
2 files changed, 14 insertions(+), 9 deletions(-)
New commits:
commit a58d877fd576bacd738972a78c8310d4eccb0daa
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Mar 13 01:19:48 2012 +0100
only shrink to used area in text export, fdo#46230, related n#677811
Signed-off-by: Kohei Yoshida kohei.yosh...@gmail.com
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index ae73542..3d70f84 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -172,9 +172,6 @@ ScTransferObj::ScTransferObj( ScDocument* pClipDoc, const
TransferableObjectDesc
}
OSL_ENSURE(!bFirst, no sheet selected);
-if (!pDoc-GetClipParam().isMultiRange() nTab1 == nTab2)
-pDoc-ShrinkToDataArea( nTab1, nCol1, nRow1, nCol2, nRow2 );
-
// only limit to used cells if whole sheet was marked
// (so empty cell areas can be copied)
if ( nCol2=MAXCOL nRow2=MAXROW )
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 5abf7d5..c183387 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -69,6 +69,7 @@ class StarBASIC;
#include editable.hxx
#include compiler.hxx
#include warnbox.hxx
+#include clipparam.hxx
#include impex.hxx
@@ -1436,26 +1437,33 @@ sal_Bool ScImportExport::Doc2Text( SvStream rStrm )
SCROW nRow;
SCCOL nStartCol = aRange.aStart.Col();
SCROW nStartRow = aRange.aStart.Row();
+SCTAB nStartTab = aRange.aStart.Tab();
SCCOL nEndCol = aRange.aEnd.Col();
SCROW nEndRow = aRange.aEnd.Row();
+SCTAB nEndTab = aRange.aEnd.Tab();
+
+if (!pDoc-GetClipParam().isMultiRange() nStartTab == nEndTab)
+pDoc-ShrinkToDataArea( nStartTab, nStartCol, nStartRow, nEndCol,
nEndRow );
+
String aCell;
+
bool bConvertLF = (GetSystemLineEnd() != LINEEND_LF);
for (nRow = nStartRow; nRow = nEndRow; nRow++)
{
-if (bIncludeFiltered || !pDoc-RowFiltered( nRow, aRange.aStart.Tab()
))
+if (bIncludeFiltered || !pDoc-RowFiltered( nRow, nStartTab ))
{
for (nCol = nStartCol; nCol = nEndCol; nCol++)
{
CellType eType;
-pDoc-GetCellType( nCol, nRow, aRange.aStart.Tab(), eType );
+pDoc-GetCellType( nCol, nRow, nStartTab, eType );
switch (eType)
{
case CELLTYPE_FORMULA:
{
if (bFormulas)
{
-pDoc-GetFormula( nCol, nRow, aRange.aStart.Tab(),
aCell );
+pDoc-GetFormula( nCol, nRow, nStartTab, aCell );
if( aCell.Search( cSep ) != STRING_NOTFOUND )
lcl_WriteString( rStrm, aCell, cStr, cStr );
else
@@ -1463,7 +1471,7 @@ sal_Bool ScImportExport::Doc2Text( SvStream rStrm )
}
else
{
-pDoc-GetString( nCol, nRow, aRange.aStart.Tab(),
aCell );
+pDoc-GetString( nCol, nRow, nStartTab, aCell );
bool bMultiLineText = ( aCell.Search( _LF ) !=
STRING_NOTFOUND );
if( bMultiLineText )
@@ -1486,7 +1494,7 @@ sal_Bool ScImportExport::Doc2Text( SvStream rStrm )
break;
case CELLTYPE_VALUE:
{
-pDoc-GetString( nCol, nRow, aRange.aStart.Tab(),
aCell );
+pDoc-GetString( nCol, nRow, nStartTab, aCell );
lcl_WriteSimpleString( rStrm, aCell );
}
break;
@@ -1495,7 +1503,7 @@ sal_Bool ScImportExport::Doc2Text( SvStream rStrm )
break;
default:
{
-pDoc-GetString( nCol, nRow, aRange.aStart.Tab(),
aCell );
+pDoc-GetString( nCol, nRow, nStartTab, aCell );
bool bMultiLineText = ( aCell.Search( _LF ) !=
STRING_NOTFOUND );
if( bMultiLineText )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 54fb699f0fae7c9f49d23a1b3f36bb12a3178503 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Mar 19 20:22:54 2012 +0100 Typo diff --git a/configure.in b/configure.in index 694b32e..70d7b7f 100644 --- a/configure.in +++ b/configure.in @@ -7479,7 +7479,7 @@ You can use --with-system-icu-for-build=force to use it anyway.]) fi libo_MINGW_CHECK_DLL([ICUDATA], [icudata][$ICU_MAJOR][$ICU_MINOR]) -libo_MINGW_CHECK_DLL([ICU18N], [icui18n][$ICU_MAJOR][$ICU_MINOR]) +libo_MINGW_CHECK_DLL([ICUI18N], [icui18n][$ICU_MAJOR][$ICU_MINOR]) libo_MINGW_CHECK_DLL([ICUUC], [icuuc][$ICU_MAJOR][$ICU_MINOR]) else AC_MSG_RESULT([internal]) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: extensions/source
extensions/source/scanner/sane.cxx | 15 +++
1 file changed, 7 insertions(+), 8 deletions(-)
New commits:
commit 52faa80a81a69ef2c1aca72653e688c6616d395f
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Mon Mar 19 22:43:30 2012 +0100
remove fiddly casts, add few const where appropriate
diff --git a/extensions/source/scanner/sane.cxx
b/extensions/source/scanner/sane.cxx
index a26ff3c..aaefbf4 100644
--- a/extensions/source/scanner/sane.cxx
+++ b/extensions/source/scanner/sane.cxx
@@ -277,8 +277,7 @@ void Sane::ReloadOptions()
if( ! IsOpen() )
return;
-SANE_Option_Descriptor* pZero = (SANE_Option_Descriptor*)
-p_get_option_descriptor( maHandle, 0 );
+const SANE_Option_Descriptor* pZero = p_get_option_descriptor( maHandle, 0
);
SANE_Word pOptions[2];
SANE_Status nStatus = p_control_option( maHandle, 0, SANE_ACTION_GET_VALUE,
(void*)pOptions, NULL );
@@ -290,8 +289,8 @@ void Sane::ReloadOptions()
fprintf( stderr, driver returned numer of options with larger size
tha SANE_Word !!!\n );
if( mppOptions )
delete [] mppOptions;
-mppOptions = (const SANE_Option_Descriptor**)new SANE_Option_Descriptor*[
mnOptions ];
-mppOptions[ 0 ] = (SANE_Option_Descriptor*)pZero;
+mppOptions = new const SANE_Option_Descriptor*[ mnOptions ];
+mppOptions[ 0 ] = pZero;
for( int i = 1; i mnOptions; i++ )
mppOptions[ i ] = (SANE_Option_Descriptor*)
p_get_option_descriptor( maHandle, i );
@@ -535,14 +534,14 @@ static inline sal_uInt8 _ReadValue( FILE* fp, int depth )
sal_Bool Sane::CheckConsistency( const char* pMes, sal_Bool bInit )
{
-static SANE_Option_Descriptor** pDescArray = NULL;
-static SANE_Option_Descriptor* pZero = NULL;
+static const SANE_Option_Descriptor** pDescArray = NULL;
+static const SANE_Option_Descriptor* pZero = NULL;
if( bInit )
{
-pDescArray = (SANE_Option_Descriptor**)mppOptions;
+pDescArray = mppOptions;
if( mppOptions )
-pZero = (SANE_Option_Descriptor*)mppOptions[0];
+pZero = mppOptions[0];
return sal_True;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/core/data/dpobject.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit f1a2c10b72a87a3826861562430fc80e3ffd6048 Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Mon Mar 19 19:12:57 2012 -0400 Fix a crash on launching the pivot layout dialog with duplicated data fields. diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index 6348b7f..9da61d1 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -2058,6 +2058,9 @@ bool ScDPObject::FillLabelDataForDimension( rLabelData.mnOriginalDim = static_castlong(nOrigPos); rLabelData.maLayoutName = aLayoutName; rLabelData.maSubtotalName = aSubtotalName; +if (nOrigPos = 0) +// This is a duplicated dimension. Use the original dimension index. +nDim = nOrigPos; GetHierarchies(nDim, rLabelData.maHiers); GetMembers(nDim, GetUsedHierarchy(nDim), rLabelData.maMembers); lcl_FillLabelData(rLabelData, xDimProp); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
