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

[Noel Grandin]

 drawinglayer/source/geometry/viewinformation2d.cxx |7 ---
 drawinglayer/source/geometry/viewinformation3d.cxx |3 ---
 drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx |3 ++-
 drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx  |2 --
 drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx|2 --
 svx/source/sdr/primitive2d/sdrprimitivetools.cxx   |4 +++-
 6 files changed, 5 insertions(+), 16 deletions(-)

New commits:
commit 3872be543252a30d020e35233415c5fccc0ea806
Author: Noel Grandin n...@peralex.com
Date:   Fri Apr 26 13:41:29 2013 +0200

Clang cleanup, unused mutex variables

Some of these were doing nothing useful at all. I removed those.
A couple were protecting static data, and I fixed those to use Mutex
and MutexGuard properly.

Change-Id: I444d13f8b6c50e526cce8d69d09aeaf240e5c6ca
Reviewed-on: https://gerrit.libreoffice.org/3678
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi

diff --git a/drawinglayer/source/geometry/viewinformation2d.cxx 
b/drawinglayer/source/geometry/viewinformation2d.cxx
index f7d0de8..8d7bc4c 100644
--- a/drawinglayer/source/geometry/viewinformation2d.cxx
+++ b/drawinglayer/source/geometry/viewinformation2d.cxx
@@ -20,7 +20,6 @@
 #include drawinglayer/geometry/viewinformation2d.hxx
 #include basegfx/matrix/b2dhommatrix.hxx
 #include basegfx/range/b2drange.hxx
-#include osl/mutex.hxx
 #include basegfx/tools/canvastools.hxx
 #include com/sun/star/geometry/AffineMatrix2D.hpp
 #include com/sun/star/geometry/RealRectangle2D.hpp
@@ -322,8 +321,6 @@ namespace drawinglayer
 
 const basegfx::B2DRange getDiscreteViewport() const
 {
-::osl::Mutex m_mutex;
-
 if(maDiscreteViewport.isEmpty()  !maViewport.isEmpty())
 {
 basegfx::B2DRange aDiscreteViewport(maViewport);
@@ -336,8 +333,6 @@ namespace drawinglayer
 
 const basegfx::B2DHomMatrix getObjectToViewTransformation() const
 {
-::osl::Mutex m_mutex;
-
 if(maObjectToViewTransformation.isIdentity() 
 (!maObjectTransformation.isIdentity() || 
!maViewTransformation.isIdentity()))
 {
@@ -350,8 +345,6 @@ namespace drawinglayer
 
 const basegfx::B2DHomMatrix 
getInverseObjectToViewTransformation() const
 {
-::osl::Mutex m_mutex;
-
 if(maInverseObjectToViewTransformation.isIdentity() 
 (!maObjectTransformation.isIdentity() || 
!maViewTransformation.isIdentity()))
 {
diff --git a/drawinglayer/source/geometry/viewinformation3d.cxx 
b/drawinglayer/source/geometry/viewinformation3d.cxx
index 7593dc0..4707be1 100644
--- a/drawinglayer/source/geometry/viewinformation3d.cxx
+++ b/drawinglayer/source/geometry/viewinformation3d.cxx
@@ -392,7 +392,6 @@ namespace drawinglayer
 const basegfx::B3DHomMatrix getObjectToView() const
 {
 // on demand WorldToView creation
-::osl::Mutex m_mutex;
 
 if(maObjectToView.isIdentity())
 {
@@ -404,8 +403,6 @@ namespace drawinglayer
 
 const uno::Sequence beans::PropertyValue  
getViewInformationSequence() const
 {
-::osl::Mutex m_mutex;
-
 if(!mxViewInformation.hasElements())
 {
 const_cast ImpViewInformation3D* 
(this)-impFillViewInformationFromContent();
diff --git a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx 
b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
index 77487db..495c06f 100644
--- a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
@@ -42,9 +42,10 @@ namespace drawinglayer
 static Primitive3DSequence aLineTubeList;
 static sal_uInt32 nLineTubeSegments(0L);
 static attribute::MaterialAttribute3D aLineMaterial;
+static ::osl::Mutex aMutex;
 
 // may exclusively change static data, use mutex
-::osl::Mutex m_mutex;
+::osl::MutexGuard aGuard(aMutex);
 
 if(nSegments != nLineTubeSegments || !(rMaterial == 
aLineMaterial))
 {
diff --git a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx 
b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
index a488ad0..1987102 100644
--- a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
@@ -377,7 +377,6 @@ namespace drawinglayer
 // again when no longer geometry is needed for non-visible 3D 
objects as it is now for chart
 if(getPolyPolygon().count()  !maSlices.size())
 {
-::osl::Mutex m_mutex;
 

[PUSHED] Clang cleanup, unused mutex variables

[Tor Lillqvist (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3678

Approvals:
  Tor Lillqvist: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3678
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I444d13f8b6c50e526cce8d69d09aeaf240e5c6ca
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Noel Grandin noelgran...@gmail.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org
Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz
Gerrit-Reviewer: Noel Grandin noelgran...@gmail.com
Gerrit-Reviewer: Tor Lillqvist t...@iki.fi

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

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

[Tor Lillqvist]

 sdext/source/pdfimport/test/pdf2xml.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e20e2715881e015bd217224bbcbd7d21f617b52a
Author: Tor Lillqvist t...@iki.fi
Date:   Tue Apr 30 09:37:47 2013 +0300

Fix warning: unused variable 'aIniUrl' [loplugin]

Change-Id: I11a2a7e8e1f3f089c3b475df1147cefafecdb376

diff --git a/sdext/source/pdfimport/test/pdf2xml.cxx 
b/sdext/source/pdfimport/test/pdf2xml.cxx
index 666781b..88b3535 100644
--- a/sdext/source/pdfimport/test/pdf2xml.cxx
+++ b/sdext/source/pdfimport/test/pdf2xml.cxx
@@ -39,7 +39,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 if( argc  4 )
 return 1;
 
-OUString aBaseURL, aTmpURL, aSrcURL, aDstURL, aIniUrl;
+OUString aBaseURL, aTmpURL, aSrcURL, aDstURL;
 
 TreeVisitorFactorySharedPtr pTreeFactory;
 if( rtl_str_compare(argv[1], -writer) == 0 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[David Tardon]

 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 728220af3af776e1a759b6051b669e87c511362d
Author: David Tardon dtar...@redhat.com
Date:   Fri Apr 26 17:22:31 2013 +0200

fdo#53163 fix hatching for objects with curves

B2DPolyPolygon can contain Bezier curves, but that is not taken into
account when drawing the hatching in OutputDevice::ImplDrawHatch. The
poly-polygon is adapted already when creating metafile, because the
information about the poly-polygon containing curves is then lost
somewhere in the process. At least, when I do the adaptation in
OutputDevice::ImplDrawHatch, it has no effect and the hatching in the
produced PDF is still wrong.

Change-Id: Ibec9d6aceb23da986fe2d2414dc2e7fd4bf835b4
(cherry picked from commit 092fa33f22bbdcb74c3533750158db1724971878)
Reviewed-on: https://gerrit.libreoffice.org/3660
Reviewed-by: Thorsten Behrens tbehr...@suse.com
Tested-by: Thorsten Behrens tbehr...@suse.com

diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index ada69e6..2127686 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -1493,7 +1493,7 @@ namespace drawinglayer
 
 // #i111954# do NOT use decomposition, but use direct 
VCL-command
 // 
process(rCandidate.get2DDecomposition(getViewInformation2D()));
-const PolyPolygon aToolsPolyPolygon(aLocalPolyPolygon);
+const PolyPolygon 
aToolsPolyPolygon(basegfx::tools::adaptiveSubdivideByAngle(aLocalPolyPolygon));
 const HatchStyle aHatchStyle(
 attribute::HATCHSTYLE_SINGLE == 
rFillHatchAttribute.getStyle() ? HATCH_SINGLE :
 attribute::HATCHSTYLE_DOUBLE == 
rFillHatchAttribute.getStyle() ? HATCH_DOUBLE :
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - drawinglayer/source

[David Tardon]

 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 98bffe149346077a9866f372fa0080dfb533c0e5
Author: David Tardon dtar...@redhat.com
Date:   Fri Apr 26 17:22:31 2013 +0200

fdo#53163 fix hatching for objects with curves

B2DPolyPolygon can contain Bezier curves, but that is not taken into
account when drawing the hatching in OutputDevice::ImplDrawHatch. The
poly-polygon is adapted already when creating metafile, because the
information about the poly-polygon containing curves is then lost
somewhere in the process. At least, when I do the adaptation in
OutputDevice::ImplDrawHatch, it has no effect and the hatching in the
produced PDF is still wrong.

Change-Id: Ibec9d6aceb23da986fe2d2414dc2e7fd4bf835b4
(cherry picked from commit 092fa33f22bbdcb74c3533750158db1724971878)
Reviewed-on: https://gerrit.libreoffice.org/3661
Reviewed-by: Thorsten Behrens tbehr...@suse.com
Tested-by: Thorsten Behrens tbehr...@suse.com

diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 3cad086..5baff82 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -1490,7 +1490,7 @@ namespace drawinglayer
 
 // #i111954# do NOT use decomposition, but use direct 
VCL-command
 // 
process(rCandidate.get2DDecomposition(getViewInformation2D()));
-const PolyPolygon aToolsPolyPolygon(aLocalPolyPolygon);
+const PolyPolygon 
aToolsPolyPolygon(basegfx::tools::adaptiveSubdivideByAngle(aLocalPolyPolygon));
 const HatchStyle aHatchStyle(
 attribute::HATCHSTYLE_SINGLE == 
rFillHatchAttribute.getStyle() ? HATCH_SINGLE :
 attribute::HATCHSTYLE_DOUBLE == 
rFillHatchAttribute.getStyle() ? HATCH_DOUBLE :
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-4-0] fdo#53163 fix hatching for objects with curves

[Thorsten Behrens (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3660

Approvals:
  Thorsten Behrens: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3660
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibec9d6aceb23da986fe2d2414dc2e7fd4bf835b4
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: David Tardon dtar...@redhat.com
Gerrit-Reviewer: Thorsten Behrens tbehr...@suse.com

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

[PUSHED libreoffice-3-6] fdo#53163 fix hatching for objects with curves

[Thorsten Behrens (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3661

Approvals:
  Thorsten Behrens: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3661
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibec9d6aceb23da986fe2d2414dc2e7fd4bf835b4
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: David Tardon dtar...@redhat.com
Gerrit-Reviewer: Thorsten Behrens tbehr...@suse.com

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

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

[Miklos Vajna]

 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit e7ecf663883478e0705e83e0a63b4abe6757b01d
Author: Miklos Vajna vmik...@suse.cz
Date:   Tue Apr 30 09:20:28 2013 +0200

OOXMLFastContextHandlerValue: clean up duplicated constant

Change-Id: Ia09e30958392b660f694e8eefb6605108b3c0b57

diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx 
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 33ab0e5..8c02cca 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -52,8 +52,6 @@ static const sal_uInt8 cFieldStart = 0x13;
 static const sal_uInt8 cFieldSep = 0x14;
 static const sal_uInt8 cFieldEnd = 0x15;
 
-static const sal_uInt16 paragraphProperties_sprmPFBiDi = 0x2441;
-
 namespace writerfilter {
 namespace ooxml
 {
@@ -1605,7 +1603,7 @@ void 
OOXMLFastContextHandlerValue::setDefaultBooleanValue()
 // Paragraph properties are not always 'true' by default
 // For example - RTL layout of paragraph is by default 'false' (look 
in this link for 'sprmPFBiDi')
 // 
http://msdn.microsoft.com/en-us/library/dd923496%28v=office.12%29.aspx
-if (getId() == paragraphProperties_sprmPFBiDi)
+if (getId() == NS_sprm::LN_PFBiDi)
 {
 bSet = false;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Cédric Bosdonnat]

 include/oox/vml/vmlshape.hxx  |2 +
 oox/source/token/properties.txt   |1 
 oox/source/vml/vmlshape.cxx   |   20 +++
 oox/source/vml/vmlshapecontext.cxx|2 +
 sw/qa/extras/ooxmlimport/data/n592908-frame.docx  |binary
 sw/qa/extras/ooxmlimport/data/n592908-picture.docx|binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  |   24 ++
 writerfilter/source/dmapper/OLEHandler.cxx|   12 -
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |8 +++---
 writerfilter/source/ooxml/OOXMLFastContextHandler.hxx |2 +
 10 files changed, 56 insertions(+), 15 deletions(-)

New commits:
commit b399c1a38cf7217bf530af3a78e8472d97890ac8
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date:   Mon Apr 29 15:41:37 2013 +0200

n#592908: docx import, fixed handling of w10:wrap

commit f837c4288cdae4921b3fb6747ba2e2cd5ce2dcd2 moved the handling of
w10:wrap tag in oox, but thus no wrapping was imported any more.

The fix consists in letting the w10:wrap element be handled by 
writerfilter's
dmapper if the shape has already been retrieved from oox (which is the
case for textboxes). In other cases, make sure that we don't set the
Surround property once again in writerfilter as that would override what
has been done in oox.

(cherry picked from commit 51d5e90b7c09cb980bc72a2c6b1a65303ef15ea2)

Conflicts:
oox/inc/oox/vml/vmlshape.hxx
sw/qa/extras/ooxmlimport/ooxmlimport.cxx

Change-Id: I8ab158641afcf6b9945c52238e7f5adb9e8b3adf

diff --git a/include/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx
index 7b6a4a9..e16fe90 100644
--- a/include/oox/vml/vmlshape.hxx
+++ b/include/oox/vml/vmlshape.hxx
@@ -93,6 +93,8 @@ struct OOX_DLLPUBLIC ShapeTypeModel
 OptValue OUString  moGraphicTitle; /// Title of the graphic.
 OptValue OUString  moWrapAnchorX;  /// The base object from which our 
horizontal positioning should be calculated.
 OptValue OUString  moWrapAnchorY;  /// The base object from which our 
vertical positioning should be calculated.
+OptValue ::rtl::OUString  moWrapType; /// How to wrap the text 
around the object
+OptValue ::rtl::OUString  moWrapSide; /// On which side to wrap the 
text around the object
 
 explicitShapeTypeModel();
 
diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt
index 2430580..fb3e5a5 100644
--- a/oox/source/token/properties.txt
+++ b/oox/source/token/properties.txt
@@ -465,6 +465,7 @@ StringItemList
 Subtotals
 SubViewSize
 Suffix
+Surround
 SwapXAndYAxis
 Symbol
 SymbolColor
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 3239151..0af325d 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -36,6 +36,7 @@
 #include com/sun/star/text/RelOrientation.hpp
 #include com/sun/star/text/SizeType.hpp
 #include com/sun/star/text/VertOrientation.hpp
+#include com/sun/star/text/WrapTextMode.hpp
 #include com/sun/star/text/XTextContent.hpp
 #include com/sun/star/text/XTextDocument.hpp
 #include com/sun/star/text/XTextFrame.hpp
@@ -405,6 +406,24 @@ SimpleShape::SimpleShape( Drawing rDrawing, const 
OUString rService ) :
 {
 }
 
+void lcl_setSurround(PropertySet rPropSet, const ShapeTypeModel rTypeModel)
+{
+sal_Int32 nSurround = com::sun::star::text::WrapTextMode_THROUGHT;
+if ( rTypeModel.moWrapType.get() == square || rTypeModel.moWrapType 
.get()== tight ||
+ rTypeModel.moWrapType.get() == through )
+{
+nSurround = com::sun::star::text::WrapTextMode_PARALLEL;
+if ( rTypeModel.moWrapSide.get() == left )
+nSurround = com::sun::star::text::WrapTextMode_LEFT;
+else if ( rTypeModel.moWrapSide.get() == right )
+nSurround = com::sun::star::text::WrapTextMode_RIGHT;
+}
+else if ( rTypeModel.moWrapType.get() == topAndBottom )
+nSurround = com::sun::star::text::WrapTextMode_NONE;
+
+rPropSet.setProperty(PROP_Surround, nSurround);
+}
+
 void lcl_SetAnchorType(PropertySet rPropSet, const ShapeTypeModel rTypeModel)
 {
 if ( rTypeModel.maPositionHorizontal == center )
@@ -449,6 +468,7 @@ void lcl_SetAnchorType(PropertySet rPropSet, const 
ShapeTypeModel rTypeModel)
 {
 rPropSet.setProperty(PROP_AnchorType, 
text::TextContentAnchorType_AS_CHARACTER);
 }
+lcl_setSurround( rPropSet, rTypeModel );
 }
 
 Reference XShape  SimpleShape::implConvertAndInsert( const Reference 
XShapes  rxShapes, const awt::Rectangle rShapeRect ) const
diff --git a/oox/source/vml/vmlshapecontext.cxx 
b/oox/source/vml/vmlshapecontext.cxx
index c5edd00..e0f8cfb 100644
--- a/oox/source/vml/vmlshapecontext.cxx
+++ b/oox/source/vml/vmlshapecontext.cxx
@@ -360,6 +360,8 @@ ContextHandlerRef ShapeTypeContext::onCreateContext( 
sal_Int32 nElement, const A
 case NMSP_vmlWord 

[Libreoffice-commits] core.git: 2 commits - configure.ac distro-configs/LibreOfficeLinux.conf distro-configs/LibreOfficeMacOSX.conf distro-configs/LibreOfficeOpenBSD.conf distro-configs/LibreOfficeWin

[Tor Lillqvist]

 configure.ac   |2 +-
 distro-configs/LibreOfficeLinux.conf   |1 +
 distro-configs/LibreOfficeMacOSX.conf  |1 +
 distro-configs/LibreOfficeOpenBSD.conf |1 +
 distro-configs/LibreOfficeWin32.conf   |1 +
 distro-configs/LibreOfficeWin64.conf   |4 ++--
 6 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 1c500ac128279d54f8c9ef841c15f43229c5ed11
Author: Tor Lillqvist t...@iki.fi
Date:   Tue Apr 30 10:44:44 2013 +0300

Fix 64-bitness option

Also, don't claim TDF would be doing 64-bit Windows builds.

Change-Id: I3abdb13cf7b29c6d249d49fd6f66ce1b9993d97e

diff --git a/distro-configs/LibreOfficeWin64.conf 
b/distro-configs/LibreOfficeWin64.conf
index 1385ded..7afbd60 100644
--- a/distro-configs/LibreOfficeWin64.conf
+++ b/distro-configs/LibreOfficeWin64.conf
@@ -1,5 +1,4 @@
---with-vendor=The Document Foundation
---enable-cl-x64
+--enable-64-bit
 --enable-postgresql-sdbc
 --disable-gtk
 --enable-scripting-beanshell
commit 0e1cc9968522b602c345aae33c4aac4c5bccd274
Author: Tor Lillqvist t...@iki.fi
Date:   Tue Apr 30 10:35:08 2013 +0300

Don't enable postgresql-sdbc by default

Try to make it more likely that a build without any autogen.sh options
succeeds. We didn't even get past the autogen.sh phase on openSUSE 12.3 
thanks
to some krb5 stuff needed by the postgresql-sdbc checks.

To compensate, add --enable-postgresql-sdbc to those distro-configs/*.conf
files that didn't already have --disable-postgresql-sdbc.

Change-Id: I967616993875b99d9d5a9fd0721f281bb1161a87

diff --git a/configure.ac b/configure.ac
index bc20dec..548951b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7769,7 +7769,7 @@ fi
 dnl ===
 dnl Check for PostgreSQL stuff
 dnl ===
-if test x$enable_postgresql_sdbc != xno; then
+if test $enable_postgresql_sdbc = yes; then
 SCPDEFS=$SCPDEFS -DWITH_POSTGRESQL_SDBC
 
 if test $with_krb5 = yes -a $enable_openssl = no; then
diff --git a/distro-configs/LibreOfficeLinux.conf 
b/distro-configs/LibreOfficeLinux.conf
index dbbdcb7..b349db6 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -23,6 +23,7 @@
 --enable-dbus
 --enable-extension-integration
 --enable-opengl
+--enable-postgresql-sdbc
 --enable-odk
 --enable-lockdown
 --enable-kde
diff --git a/distro-configs/LibreOfficeMacOSX.conf 
b/distro-configs/LibreOfficeMacOSX.conf
index 367d4c8..8ecbc82 100644
--- a/distro-configs/LibreOfficeMacOSX.conf
+++ b/distro-configs/LibreOfficeMacOSX.conf
@@ -7,6 +7,7 @@
 --enable-ext-nlpsolver
 --enable-extension-integration
 --enable-online-update
+--enable-postgresql-sdbc
 --without-system-postgresql
 --disable-gtk
 --with-help
diff --git a/distro-configs/LibreOfficeOpenBSD.conf 
b/distro-configs/LibreOfficeOpenBSD.conf
index 6a52daf..9b2706c 100644
--- a/distro-configs/LibreOfficeOpenBSD.conf
+++ b/distro-configs/LibreOfficeOpenBSD.conf
@@ -12,6 +12,7 @@
 --enable-lockdown
 --enable-ext-presenter-minimizer
 --enable-ext-wiki-publisher
+--enable-postgresql-sdbc
 --enable-python=system
 --with-alloc=system
 --with-ant-home=/usr/local/ant
diff --git a/distro-configs/LibreOfficeWin32.conf 
b/distro-configs/LibreOfficeWin32.conf
index 3e99f74..e07584a 100644
--- a/distro-configs/LibreOfficeWin32.conf
+++ b/distro-configs/LibreOfficeWin32.conf
@@ -5,6 +5,7 @@
 --without-helppack-integration
 --enable-extension-integration
 --disable-gtk
+--enable-postgresql-sdbc
 --enable-scripting-beanshell
 --enable-scripting-javascript
 --enable-ext-wiki-publisher
diff --git a/distro-configs/LibreOfficeWin64.conf 
b/distro-configs/LibreOfficeWin64.conf
index 0c17d07..1385ded 100644
--- a/distro-configs/LibreOfficeWin64.conf
+++ b/distro-configs/LibreOfficeWin64.conf
@@ -1,5 +1,6 @@
 --with-vendor=The Document Foundation
 --enable-cl-x64
+--enable-postgresql-sdbc
 --disable-gtk
 --enable-scripting-beanshell
 --enable-scripting-javascript
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - instsetoo_native/inc_ooohelppack instsetoo_native/inc_ooolangpack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo instsetoo_n

[Andras Timar]

 instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt |2 +-
 instsetoo_native/inc_ooolangpack/windows/msi_templates/Property.idt |2 +-
 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt  |2 +-
 instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt   |2 +-
 instsetoo_native/inc_ure/windows/msi_templates/Property.idt |2 +-
 scp2/source/ooo/windowscustomaction_ooo.scp |4 ++--
 solenv/bin/modules/installer/windows/upgrade.pm |9 
++---
 7 files changed, 9 insertions(+), 14 deletions(-)

New commits:
commit bb5bde68172dadf8e0ed13b40d523af28e2a7600
Author: Andras Timar ati...@suse.com
Date:   Wed Apr 24 04:11:02 2013 -0700

Upgrade table cleanup

The goal was to migrate feature state from LibreOffice 3.6 (SUSE)
to LibreOffice 4.0 (SUSE) during upgrade.

Change-Id: I0d7b7511316a9799acb078ee2923a5cac2e40aa9

diff --git 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
index 6cb7e5c..6768f4f 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
@@ -40,7 +40,7 @@ ProgressType2 installed
 ProgressType3  installs
 RebootYesNoYes
 ReinstallModeText  omus
-SecureCustomProperties 
NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS;OLDPRODUCTSSAMEMAJOR
+SecureCustomProperties NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS
 SetupType  Typical
 STR_NEW_DISPLAY_NAME   OOO_STR_NEW_DISPLAY_NAME
 STR_EDIT   OOO_STR_EDIT
diff --git 
a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Property.idt
index 6cb7e5c..6768f4f 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Property.idt
@@ -40,7 +40,7 @@ ProgressType2 installed
 ProgressType3  installs
 RebootYesNoYes
 ReinstallModeText  omus
-SecureCustomProperties 
NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS;OLDPRODUCTSSAMEMAJOR
+SecureCustomProperties NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS
 SetupType  Typical
 STR_NEW_DISPLAY_NAME   OOO_STR_NEW_DISPLAY_NAME
 STR_EDIT   OOO_STR_EDIT
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
index 301dd7b..4d3c684 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
@@ -42,7 +42,7 @@ ProgressType3 installs
 Quickstarterlinkname   QUICKSTARTERLINKNAMETEMPLATE
 RebootYesNoYes
 ReinstallModeText  omus
-SecureCustomProperties 
NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS;OLDPRODUCTSSAMEMAJOR;OLDPRODUCTS2;BETAPRODUCTS;STUBPRODUCTS
+SecureCustomProperties 
NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS;OLDPRODUCTS2;BETAPRODUCTS;STUBPRODUCTS
 SetupType  Typical
 SELECT_WORD0
 SELECT_EXCEL   0
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt
index 91858c2..300adb5 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt
@@ -41,7 +41,7 @@ ProgressType2 installed
 ProgressType3  installs
 RebootYesNoYes
 ReinstallModeText  omus
-SecureCustomProperties 
NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS;OLDPRODUCTSSAMEMAJOR
+SecureCustomProperties NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS
 SetupType  Typical
 STR_NEW_DISPLAY_NAME   OOO_STR_NEW_DISPLAY_NAME
 STR_EDIT   OOO_STR_EDIT
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_ure/windows/msi_templates/Property.idt
index 8ea4048..db43028 100644
--- a/instsetoo_native/inc_ure/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_ure/windows/msi_templates/Property.idt
@@ -42,7 +42,7 @@ ProgressType2 installed
 ProgressType3  installs
 RebootYesNoYes
 ReinstallModeText  omus
-SecureCustomProperties 
NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS;OLDPRODUCTSSAMEMAJOR
+SecureCustomProperties NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS
 SetupType  Typical
 STR_NEW_DISPLAY_NAME   OOO_STR_NEW_DISPLAY_NAME
 STR_EDIT   OOO_STR_EDIT
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp 
b/scp2/source/ooo/windowscustomaction_ooo.scp
index b489c32..31c783a 100644
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -33,7 +33,7 @@ WindowsCustomAction gid_Customaction_RenamePrgFolder
Source = shlxtmsi.dll;
Target = RenamePrgFolder;
Inbinarytable = 1;
-   Assignment1 = (InstallExecuteSequence, VersionNT = 600 And 
OLDPRODUCTSSAMEMAJOR And Not REMOVE=\ALL\ And Not PATCH, 
ValidateProductID);
+   Assignment1 = 

[Libreoffice-commits] core.git: distro-configs/README

[Tor Lillqvist]

 distro-configs/README |   31 +--
 1 file changed, 21 insertions(+), 10 deletions(-)

New commits:
commit 0e881978998e9b17495a63de3bb9e22aa1474066
Author: Tor Lillqvist t...@iki.fi
Date:   Tue Apr 30 11:13:35 2013 +0300

Clarify intended use of these files

Or, as it might happen, not... If there are differing opinions, please 
revert
and/or amend. Or start a discussion on the development list.

Change-Id: Ide5060802fda2d59a1c098d1ba8398fc095007c8

diff --git a/distro-configs/README b/distro-configs/README
index f22328f..38812fb 100644
--- a/distro-configs/README
+++ b/distro-configs/README
@@ -1,14 +1,25 @@
-Pre-canned distribution / platform configurations
+Pre-canned distribution configurations
 
-When the software is configured for a platform, since we run on so
-many platforms, detecting the best sequence of configure options to
-get it building is hard.
+These files are supposed to correspond to the options used when
+creating the Document Foundation (or other canonical) builds of
+LibreOffice for various platforms. They are *not* supposed to
+represent the most useful options for developers in general. On the
+contrary, the intent is that just running ./autogen.sh without any
+options at all should produce a buildable configuration for developers
+with interest in working on the most commonly used parts of the code.
 
-Instead we have a text file containing the recommended (often the
-distributed) version of these parameters, one per distribution or
-significant platform. These are interpreted by autogen.sh and
-eventually end up passed to configure. Thus:
+(Possibly the above is a misunderstanding, or maybe there never even
+has been any clear consensus what situations these files actually are
+intended for.)
 
-./autogen.sh --with-distro=LibreOfficeAndroid
+The files contain sets of configuration parameters, and can be passed
+on the autogen.sh command line thus:
 
-might build a version tweaked for Android.
+./autogen.sh --with-distro=LibreOfficeFoo
+
+Contrary to the above, in the Android and iOS cases the amount of
+parameters you just must use is so large, that for convenience it is
+always easiest to use the corresponding distro-configs file. This is a
+bug and needs to be fixed; also configuring for those platforms needs
+to use sane (or only possible) defaults and work fine wihout any
+parameters at all.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/inc_ooohelppack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo instsetoo_native/util scp2/source setup_native/source solenv/bin

[Andras Timar]

 instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt |2 
 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt  |2 
 instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt   |2 
 instsetoo_native/util/openoffice.lst.in |4 
 scp2/source/ooo/windowscustomaction_ooo.scp |4 
 setup_native/source/win32/customactions/tools/checkversion.cxx  |   40 
-
 setup_native/source/win32/customactions/tools/seterror.hxx  |   10 -
 solenv/bin/modules/installer/windows/upgrade.pm |   80 
--
 8 files changed, 7 insertions(+), 137 deletions(-)

New commits:
commit 5b77c93b28b7f7b705617839eb72798568ce9f15
Author: Andras Timar ati...@suse.com
Date:   Thu Apr 25 01:54:20 2013 -0700

remove unused product variables from Windows installer

OLDPRODUCT2 - it was a workaround for OOo 1.9, obsolete
SAMEPRODUCTS - same product have the same ProductCode, so installer detect 
it
anyway under normal circumstances. It is possible that a tester/developer 
tries
to install the same version with different ProductCode over an existing 
installation
(e.g. dailyes or RCs). Then we are in trouble. However, SAMEPRODUCTS was 
not in use.
Moreover, Windows Installer uses only the first three fields of the product 
version.
So we cannot make difference between e.g. 4.0.3.1 and 4.0.3.2, and this is 
the new versioning
scheme.
BETAPRODUCTS - LibreOffice have never used different upgrade code 
(BETAUPGRADECODE) for betas.
OLDPRODUCTSPATCH, SAMEPRODUCTSPATCH, NEWPRODUCTSPATCH - related to old Star 
Division patching
mechanism, they were commented out anyway.
STUBPRODUCTS, STUBUPGRADECODE - these look useless

Change-Id: I77d67b72e18fa6b3ba4182b99e198c42f247cea4

diff --git 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
index b8a970c..9fc0421 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
@@ -40,7 +40,7 @@ ProgressType2 installed
 ProgressType3  installs
 RebootYesNoYes
 ReinstallModeText  omus
-SecureCustomProperties 
NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS;OLDPRODUCTSSAMEMAJOR
+SecureCustomProperties NEWPRODUCTS;OLDPRODUCTS
 SetupType  Typical
 STR_NEW_DISPLAY_NAME   OOO_STR_NEW_DISPLAY_NAME
 STR_EDIT   OOO_STR_EDIT
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
index 44d2c38..9923857 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
@@ -42,7 +42,7 @@ ProgressType3 installs
 Quickstarterlinkname   QUICKSTARTERLINKNAMETEMPLATE
 RebootYesNoYes
 ReinstallModeText  omus
-SecureCustomProperties 
NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS;OLDPRODUCTSSAMEMAJOR;OLDPRODUCTS2;BETAPRODUCTS;STUBPRODUCTS
+SecureCustomProperties NEWPRODUCTS;OLDPRODUCTS
 SetupType  Typical
 SELECT_WORD0
 SELECT_EXCEL   0
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt
index cdcaea4..8848ac8 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt
@@ -41,7 +41,7 @@ ProgressType2 installed
 ProgressType3  installs
 RebootYesNoYes
 ReinstallModeText  omus
-SecureCustomProperties 
NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS;OLDPRODUCTSSAMEMAJOR
+SecureCustomProperties NEWPRODUCTS;OLDPRODUCTS
 SetupType  Typical
 STR_NEW_DISPLAY_NAME   OOO_STR_NEW_DISPLAY_NAME
 STR_EDIT   OOO_STR_EDIT
diff --git a/instsetoo_native/util/openoffice.lst.in 
b/instsetoo_native/util/openoffice.lst.in
index 61d295b..ffef5c7 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -68,8 +68,6 @@ LibreOffice
 GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
 SPELLCHECKERFILE spellchecker_selection.txt
 OOODOWNLOADNAME 1
-BETAUPGRADECODE
-STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
 CHANGETARGETDIR 1
 PATCHCODEFILE ooo_patchcodes.txt
 STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
@@ -124,8 +122,6 @@ LibreOffice_Dev
 GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
 SPELLCHECKERFILE spellchecker_selection.txt
 OOODOWNLOADNAME 1
-BETAUPGRADECODE
-STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
 CHANGETARGETDIR 1
 PATCHCODEFILE ooodev_patchcodes.txt
 CODEFILENAME codes_ooodev.txt
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp 

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

[Thorsten Behrens]

 vcl/source/filter/graphicfilter.cxx |   15 ---
 vcl/source/filter/wmf/winmtf.cxx|2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit 9349a8793bd2cb930b88d3bb1d1622fb084dd555
Author: Thorsten Behrens tbehr...@suse.com
Date:   Tue Apr 30 10:29:27 2013 +0200

Fixup German translation.

This touches up lightly on e986d3e396174096abb46075bf7488677b9a35f9

Change-Id: If4d940433b27abec63a85c5975f5e9ebf672b79a

diff --git a/vcl/source/filter/graphicfilter.cxx 
b/vcl/source/filter/graphicfilter.cxx
index d9944fa..36389ea 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -236,7 +236,7 @@ bool isPCT(SvStream rStream, sal_uLong nStreamPos, 
sal_uLong nStreamLen)
  *Output parameters:
  *  Return value - sal_True if success
  *  rFormatExtension - on success: normal file extension in 
capitals
- *2.) Start reading file, check file format
+ *2.) Start reading file, verify file format
  *Input parameters:
  *  rPath- file path
  *  rFormatExtension - normal file extension in capitals
@@ -301,13 +301,13 @@ static sal_Bool ImpPeekGraphicFormat( SvStream rStream, 
String rFormatExtensio
 // if the format (rFormatExtension) has not yet been set.
 sal_Bool bSomethingTested = sal_False;
 
-// Now the different formats are checked. The order does not matter. e.g. 
a MET file
+// Now the different formats are checked. The order *does* matter. e.g. a 
MET file
 // could also go through the BMP test, howeve a BMP file can hardly go 
through the MET test.
 // So MET should be tested prior to BMP. However, theoretically a BMP file 
could conceivably
 // go through the MET test. These problems are of course not only in MET 
and BMP.
-// Therefore, in the case of a format check (bTest == sal_True)  we only 
test this format.
-// Everything else could have fatal consequences, for example if the user 
says it is a BMP file
-// (and it is a BMP) file, and the file would go through the MET test ...
+// Therefore, in the case of a format check (bTest == sal_True)  we only 
test *exactly* this
+// format. Everything else could have fatal consequences, for example if 
the user says it is
+// a BMP file (and it is a BMP) file, and the file would go through the 
MET test ...
 //--- MET 
 if( !bTest || ( rFormatExtension.CompareToAscii( MET, 3 ) == 
COMPARE_EQUAL ) )
 {
@@ -342,8 +342,9 @@ static sal_Bool ImpPeekGraphicFormat( SvStream rStream, 
String rFormatExtensio
 
 bSomethingTested=sal_True;
 
-// We could be reading an OS/2 bitmap array ('BA'), therefore we must 
adjust
-// the offset to discover the first bitmap in the array
+// We're possibly also able to read an OS/2 bitmap array
+// ('BA'), therefore we must adjust the offset to discover the
+// first bitmap in the array
 if ( sFirstBytes[0] == 0x42  sFirstBytes[1] == 0x41 )
 nOffs = 14;
 else
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index 1fc47f5..c8c6652 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -537,7 +537,7 @@ Rectangle WinMtfOutput::ImplMap( const Rectangle rRect )
 void WinMtfOutput::ImplMap( Font rFont )
 {
 // !!! HACK: we now always set the width to zero because the OS width is 
interpreted differently;
-// must later be made portable in SV (CA 08/02/96)
+// must later be made portable in SV (KA 1996-02-08)
 Size  aFontSize = ImplMap ( rFont.GetSize() );
 
 if( aFontSize.Height()  0 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - framework/inc framework/source include/sfx2 sc/sdi sc/source sfx2/sdi sfx2/source sw/sdi sw/source

[Jan Holesovsky]

 framework/inc/uielement/recentfilesmenucontroller.hxx|1 
 framework/source/uielement/recentfilesmenucontroller.cxx |2 
 include/sfx2/tbxctrl.hxx |   30 
 sc/sdi/scalc.sdi |3 
 sc/source/ui/app/scdll.cxx   |2 
 sfx2/sdi/sfx.sdi |3 
 sfx2/source/appl/appreg.cxx  |1 
 sfx2/source/toolbox/tbxitem.cxx  |   56 +++
 sw/sdi/swriter.sdi   |3 
 sw/source/ui/app/swmodule.cxx|2 
 10 files changed, 85 insertions(+), 18 deletions(-)

New commits:
commit f60424b29622033ae02491bda328c304ae1bc05d
Author: Jan Holesovsky ke...@suse.cz
Date:   Tue Apr 30 10:31:00 2013 +0200

bnc#816516: Implement easy access to the recent documents.

This adds a dropdown to the 'Open' toolbar tool.

Change-Id: I5b4aa99476e721c1479152b46bbc79cc0b095318

diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx
index 6c12947..e50527f 100644
--- a/include/sfx2/tbxctrl.hxx
+++ b/include/sfx2/tbxctrl.hxx
@@ -162,7 +162,7 @@ public:
 
 #define SFX_DECL_TOOLBOX_CONTROL() \
 static SfxToolBoxControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 
nId, ToolBox rTbx ); \
-static void RegisterControl(sal_uInt16 nSlotId = 0, SfxModule 
*pMod=NULL)
+static void SFX2_DLLPUBLIC RegisterControl(sal_uInt16 nSlotId = 0, 
SfxModule *pMod=NULL)
 
 /*  For special ToolBox controls, such as a font selection box or toolbox
 tear-off floating windows, an appropriate Item-Subclass of SfxTooBoxControl
@@ -351,6 +351,23 @@ private:
 sal_Boolm_bShowMenuImages;
 };
 
+/** Toolbox that implements recent files menu for the Open file toolbar button.
+
+To use that, the appropriate Sfx*Item (like Open, OpenFromCalc, or
+OpenFromWriter) has to have SlotType = SfxStringItem, and the appropriate
+module initialization has to call RegisterControl().
+*/
+class SfxRecentFilesToolBoxControl : public SfxToolBoxControl
+{
+public:
+SFX_DECL_TOOLBOX_CONTROL();
+SfxRecentFilesToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox 
rBox );
+virtual ~SfxRecentFilesToolBoxControl();
+
+protected:
+virtual SfxPopupWindow* CreatePopupWindow();
+};
+
 class SfxReloadToolBoxControl_Impl : public SfxToolBoxControl
 {
 protected:
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index 7ab61a1..2780301 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -8333,6 +8333,9 @@ SfxVoidItem OpenFromCalc SID_OPEN_CALC
 RecordPerSet;
 Synchron;
 
+/* status: */
+SlotType = SfxStringItem
+
 /* config: */
 AccelConfig = TRUE,
 MenuConfig = TRUE,
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 3220463..9ed0e3a 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -172,6 +172,8 @@ void ScDLL::Init()
 ScMediaShell::RegisterInterface(pMod);
 ScPageBreakShell::RegisterInterface(pMod);
 
+SfxRecentFilesToolBoxControl::RegisterControl(SID_OPEN_CALC, pMod);
+
 //  eigene Controller
 ScTbxInsertCtrl ::RegisterControl(SID_TBXCTL_INSERT, pMod);
 ScTbxInsertCtrl ::RegisterControl(SID_TBXCTL_INSCELLS, pMod);
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 0fe9cdc..ad70c3a 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -4358,6 +4358,9 @@ SfxObjectItem Open SID_OPENDOC
 RecordPerSet;
 Asynchron;
 
+/* status: */
+SlotType = SfxStringItem
+
 /* config: */
 AccelConfig = TRUE,
 MenuConfig = TRUE,
diff --git a/sfx2/source/appl/appreg.cxx b/sfx2/source/appl/appreg.cxx
index 0c54aa8..f3e7365 100644
--- a/sfx2/source/appl/appreg.cxx
+++ b/sfx2/source/appl/appreg.cxx
@@ -64,6 +64,7 @@ void SfxApplication::Registrations_Impl()
 SfxURLToolBoxControl_Impl::RegisterControl(SID_OPENURL);
 SfxAppToolBoxControl_Impl::RegisterControl( SID_NEWDOCDIRECT );
 SfxAppToolBoxControl_Impl::RegisterControl( SID_AUTOPILOTMENU );
+SfxRecentFilesToolBoxControl::RegisterControl( SID_OPENDOC );
 };
 
 //
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index a9e786f..8085dcc 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -25,7 +25,9 @@
 #include string   // prevent conflict with STL includes
 #include com/sun/star/uno/Reference.h
 #include com/sun/star/frame/XFrame.hpp
+#include com/sun/star/awt/XPopupMenu.hpp
 #include com/sun/star/awt/XWindow.hpp
+#include com/sun/star/awt/XWindowPeer.hpp
 #include com/sun/star/util/URL.hpp
 #include com/sun/star/util/URLTransformer.hpp
 #include com/sun/star/util/XURLTransformer.hpp
@@ -38,6 +40,7 @@
 #include com/sun/star/beans/PropertyValue.hpp
 #include 

[PATCH] fdo#37222 and fdo#37219 Open pdf after Export and added to ...

[Anurag Kanungo (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3693

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/93/3693/1

fdo#37222 and fdo#37219  Open pdf after Export and added to recent documents.

Added an checkbox option view pdf after Export  in Export Dialog Box .

If a user ticks it , pdf file will be opened after export
else only export will be done .

Change-Id: Ibc4bf200c67d090d61e6024519b9057f9f8bfd6f
---
M filter/source/pdf/impdialog.cxx
M filter/source/pdf/impdialog.hrc
M filter/source/pdf/impdialog.hxx
M filter/source/pdf/impdialog.src
M filter/source/pdf/pdffilter.cxx
5 files changed, 29 insertions(+), 0 deletions(-)



diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 9ddf052..d70d17f 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -39,6 +39,7 @@
 
 #include boost/shared_ptr.hpp
 
+extern int pdfview;
 static ResMgr getPDFFilterResMgr()
 {
 static ResMgr *pRes = ResMgr::CreateResMgr( pdffilter, 
Application::GetSettings().GetUILanguageTag());
@@ -80,6 +81,7 @@
 mnMaxImageResolution( 300 ),
 mbUseTaggedPDF( sal_False ),
 mbExportNotes( sal_True ),
+mbVIEWPDF( sal_False ),
 mbExportNotesPages( sal_False ),
 mbUseTransitionEffects( sal_False ),
 mbIsSkipEmptyPages( sal_True ),
@@ -511,6 +513,7 @@
 maCbExportBookmarks( this, PDFFilterResId( CB_EXPORTBOOKMARKS ) ),
 maCbExportHiddenSlides( this, PDFFilterResId( CB_EXPORTHIDDENSLIDES ) ),
 maCbExportNotes( this, PDFFilterResId( CB_EXPORTNOTES ) ),
+maCbVIEWPDF( this, PDFFilterResId( CB_VIEWPDF ) ),
 maCbExportNotesPages( this, PDFFilterResId( CB_EXPORTNOTESPAGES ) ),
 maCbExportEmptyPages( this, PDFFilterResId( CB_EXPORTEMPTYPAGES ) ),
 maCbAddStream( this, PDFFilterResId( CB_ADDSTREAM ) ),
@@ -702,6 +705,12 @@
 paParent-mbExportFormFields = maCbExportFormFields.IsChecked();
 paParent-mbEmbedStandardFonts = maCbEmbedStandardFonts.IsChecked();
 }
+
+if( maCbVIEWPDF.IsChecked() )
+pdfview=1;
+else
+pdfview=0;
+
 paParent-maWatermarkText = maEdWatermark.GetText();
 
 /*
diff --git a/filter/source/pdf/impdialog.hrc b/filter/source/pdf/impdialog.hrc
index 03b6d55..938b622 100644
--- a/filter/source/pdf/impdialog.hrc
+++ b/filter/source/pdf/impdialog.hrc
@@ -87,6 +87,7 @@
 #define CB_WATERMARK32
 #define FT_WATERMARK33
 #define ED_WATERMARK34
+#define CB_VIEWPDF  35
 
 
 //controls for open options tab page
diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx
index 11a3f38..3b0d96c 100644
--- a/filter/source/pdf/impdialog.hxx
+++ b/filter/source/pdf/impdialog.hxx
@@ -94,6 +94,7 @@
 sal_BoolmbUseTaggedPDF;
 sal_Int32   mnPDFTypeSelection;
 sal_BoolmbExportNotes;
+sal_BoolmbVIEWPDF;
 sal_BoolmbExportNotesPages;
 sal_BoolmbUseTransitionEffects;
 sal_BoolmbIsSkipEmptyPages;
@@ -210,6 +211,7 @@
 CheckBoxmaCbExportBookmarks;
 CheckBoxmaCbExportHiddenSlides;
 CheckBoxmaCbExportNotes;
+CheckBoxmaCbVIEWPDF;
 CheckBoxmaCbExportNotesPages;
 
 CheckBoxmaCbExportEmptyPages;
diff --git a/filter/source/pdf/impdialog.src b/filter/source/pdf/impdialog.src
index 8d74616..1d6e202 100644
--- a/filter/source/pdf/impdialog.src
+++ b/filter/source/pdf/impdialog.src
@@ -278,6 +278,13 @@
 TabStop = TRUE ;
 Text[ en-US ] = ~Export comments;
 };
+CheckBox CB_VIEWPDF
+{
+Pos = MAP_APPFONT ( 188 , 131 ) ;
+Size = MAP_APPFONT ( 158 , 10 ) ;
+TabStop = TRUE ;
+Text[ en-US ] = ~View Pdf after Export;
+};
 CheckBox CB_EXPORTNOTESPAGES
 {
 HelpID = filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTNOTESPAGES;
diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx
index 9aadfed..8c660b9 100644
--- a/filter/source/pdf/pdffilter.cxx
+++ b/filter/source/pdf/pdffilter.cxx
@@ -24,7 +24,11 @@
 #include vcl/window.hxx
 #include svl/outstrm.hxx
 #include vcl/FilterConfigItem.hxx
+#include com/sun/star/system/SystemShellExecute.hpp
+#include com/sun/star/system/SystemShellExecuteFlags.hpp
 
+using namespace css::system;
+int pdfview;
 // -
 // - PDFFilter -
 // -
@@ -51,6 +55,7 @@
 sal_BoolbRet = sal_False;
 Reference task::XStatusIndicator  xStatusIndicator;
 Reference task::XInteractionHandler  xIH;
+OUString aUrl; 
 
 for ( sal_Int32 i = 0 ; ( i  nLength )  !xOStm.is(); ++i)
 {
@@ -62,6 +67,8 @@
 pValue[ i ].Value = xStatusIndicator;
 else if ( pValue[i].Name == 

Re: [PATCH] fdo#37222 and fdo#37219 Open pdf after Export and added to ...

[Anurag Kanungo]

It is the Dialog box which is opened after clicking on Export as PDF ,

Screen shot is attached


On Tue, Apr 30, 2013 at 2:08 PM, Anurag Kanungo (via Code Review) 
ger...@gerrit.libreoffice.org wrote:

 Hi,

 I have submitted a patch for review:

 https://gerrit.libreoffice.org/3693

 To pull it, you can do:

 git pull ssh://gerrit.libreoffice.org:29418/corerefs/changes/93/3693/1

 fdo#37222 and fdo#37219  Open pdf after Export and added to recent
 documents.

 Added an checkbox option view pdf after Export  in Export Dialog Box .

 If a user ticks it , pdf file will be opened after export
 else only export will be done .

 Change-Id: Ibc4bf200c67d090d61e6024519b9057f9f8bfd6f
 ---
 M filter/source/pdf/impdialog.cxx
 M filter/source/pdf/impdialog.hrc
 M filter/source/pdf/impdialog.hxx
 M filter/source/pdf/impdialog.src
 M filter/source/pdf/pdffilter.cxx
 5 files changed, 29 insertions(+), 0 deletions(-)



 diff --git a/filter/source/pdf/impdialog.cxx
 b/filter/source/pdf/impdialog.cxx
 index 9ddf052..d70d17f 100644
 --- a/filter/source/pdf/impdialog.cxx
 +++ b/filter/source/pdf/impdialog.cxx
 @@ -39,6 +39,7 @@

  #include boost/shared_ptr.hpp

 +extern int pdfview;
  static ResMgr getPDFFilterResMgr()
  {
  static ResMgr *pRes = ResMgr::CreateResMgr( pdffilter,
 Application::GetSettings().GetUILanguageTag());
 @@ -80,6 +81,7 @@
  mnMaxImageResolution( 300 ),
  mbUseTaggedPDF( sal_False ),
  mbExportNotes( sal_True ),
 +mbVIEWPDF( sal_False ),
  mbExportNotesPages( sal_False ),
  mbUseTransitionEffects( sal_False ),
  mbIsSkipEmptyPages( sal_True ),
 @@ -511,6 +513,7 @@
  maCbExportBookmarks( this, PDFFilterResId( CB_EXPORTBOOKMARKS ) ),
  maCbExportHiddenSlides( this, PDFFilterResId( CB_EXPORTHIDDENSLIDES )
 ),
  maCbExportNotes( this, PDFFilterResId( CB_EXPORTNOTES ) ),
 +maCbVIEWPDF( this, PDFFilterResId( CB_VIEWPDF ) ),
  maCbExportNotesPages( this, PDFFilterResId( CB_EXPORTNOTESPAGES ) ),
  maCbExportEmptyPages( this, PDFFilterResId( CB_EXPORTEMPTYPAGES ) ),
  maCbAddStream( this, PDFFilterResId( CB_ADDSTREAM ) ),
 @@ -702,6 +705,12 @@
  paParent-mbExportFormFields = maCbExportFormFields.IsChecked();
  paParent-mbEmbedStandardFonts =
 maCbEmbedStandardFonts.IsChecked();
  }
 +
 +if( maCbVIEWPDF.IsChecked() )
 +pdfview=1;
 +else
 +pdfview=0;
 +
  paParent-maWatermarkText = maEdWatermark.GetText();

  /*
 diff --git a/filter/source/pdf/impdialog.hrc
 b/filter/source/pdf/impdialog.hrc
 index 03b6d55..938b622 100644
 --- a/filter/source/pdf/impdialog.hrc
 +++ b/filter/source/pdf/impdialog.hrc
 @@ -87,6 +87,7 @@
  #define CB_WATERMARK32
  #define FT_WATERMARK33
  #define ED_WATERMARK34
 +#define CB_VIEWPDF  35


  //controls for open options tab page
 diff --git a/filter/source/pdf/impdialog.hxx
 b/filter/source/pdf/impdialog.hxx
 index 11a3f38..3b0d96c 100644
 --- a/filter/source/pdf/impdialog.hxx
 +++ b/filter/source/pdf/impdialog.hxx
 @@ -94,6 +94,7 @@
  sal_BoolmbUseTaggedPDF;
  sal_Int32   mnPDFTypeSelection;
  sal_BoolmbExportNotes;
 +sal_BoolmbVIEWPDF;
  sal_BoolmbExportNotesPages;
  sal_BoolmbUseTransitionEffects;
  sal_BoolmbIsSkipEmptyPages;
 @@ -210,6 +211,7 @@
  CheckBoxmaCbExportBookmarks;
  CheckBoxmaCbExportHiddenSlides;
  CheckBoxmaCbExportNotes;
 +CheckBoxmaCbVIEWPDF;
  CheckBoxmaCbExportNotesPages;

  CheckBoxmaCbExportEmptyPages;
 diff --git a/filter/source/pdf/impdialog.src
 b/filter/source/pdf/impdialog.src
 index 8d74616..1d6e202 100644
 --- a/filter/source/pdf/impdialog.src
 +++ b/filter/source/pdf/impdialog.src
 @@ -278,6 +278,13 @@
  TabStop = TRUE ;
  Text[ en-US ] = ~Export comments;
  };
 +CheckBox CB_VIEWPDF
 +{
 +Pos = MAP_APPFONT ( 188 , 131 ) ;
 +Size = MAP_APPFONT ( 158 , 10 ) ;
 +TabStop = TRUE ;
 +Text[ en-US ] = ~View Pdf after Export;
 +};
  CheckBox CB_EXPORTNOTESPAGES
  {
  HelpID = filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTNOTESPAGES;
 diff --git a/filter/source/pdf/pdffilter.cxx
 b/filter/source/pdf/pdffilter.cxx
 index 9aadfed..8c660b9 100644
 --- a/filter/source/pdf/pdffilter.cxx
 +++ b/filter/source/pdf/pdffilter.cxx
 @@ -24,7 +24,11 @@
  #include vcl/window.hxx
  #include svl/outstrm.hxx
  #include vcl/FilterConfigItem.hxx
 +#include com/sun/star/system/SystemShellExecute.hpp
 +#include com/sun/star/system/SystemShellExecuteFlags.hpp

 +using namespace css::system;
 +int pdfview;
  // -
  // - PDFFilter -
  // -
 @@ -51,6 +55,7 @@
  sal_BoolbRet = 

Re: Need Guidance on bug fdo#37222

[Anurag Kanungo]

Hi,
Thanks for the guidance ,

please check https://gerrit.libreoffice.org/3693

I was able to export the pdf file , so i created a checkbox in  export as
pdf  dialog stating View pdf after export 

So, if a user ticks it , pdf file is exported  and opened
   else file is only exported

but for this i used a global variable ,

As i wasn't able to find out that how to pass a value that checkbox is
ticked or not from the impdialog.cxx  to pdffilter.cxx

impdialog.cxx  contains checkbox code

pdffilter.cxx  contians opening a pdf code

Please guide ,
May be it could be too easy , but i wasn't able to figure out , so i used
global variable .



On Mon, Apr 29, 2013 at 9:55 PM, Tomaž Vajngerl qui...@gmail.com wrote:

 Hi,

 Please, unless explicitly asked, always make sure that LO development
 mailing list is in the CC of the mail when replying (or reply to all).

 Actually you have to go to pdffilter.cxx - PDFFilter::implExport. You
 will have to get the URL from the rDescriptor which contains the location
 and filename of the PDF that will be saved. To get it you have to do
 something similar to how OutputStream, FilterData,
 StatusIndicator,... are done:

 if ( pValue[ i ].Name == URL )
pValue[ i ].Value = aUrl;

 aUrl should be a OUString.

 Regards, Tomaž





  On Mon, Apr 29, 2013 at 4:10 PM, Anurag Kanungo 
 anuragkanu...@gmail.comwrote:

 Hi,

 Thank you for the reply,

 Well i used,


 ReferenceXSystemShellExecute
 xSystemShellExecute(SystemShellExecute::create(
 ::comphelper::getProcessComponentContext() ) );
  xSystemShellExecute-execute(rFile, ,
 SystemShellExecuteFlags::URIS_ONLY );

 in sal_Bool PDFExport::Export( const OUString rFile, const Sequence
 PropertyValue  rFilterData )


 after including the header and namespace for xSystemShell

 but on executing(Export a pdf file) , it shows rFile to be a tmp file,

 gvfs-open: file:///tmp/lu305f9i.tmp/lu305faq.tmp: error opening location:
 Error when getting information for file '/tmp/lu305f9i.tmp/lu305faq.tmp':
 No such file or directory


 How to get the exact file path, which is entered by user .








 On Sun, Apr 28, 2013 at 2:55 PM, Tomaž Vajngerl qui...@gmail.com wrote:

 Hi,

 system(xdg-open abc.pdf); is not good enough - this won't work on OSX
 or Windows.

 You have to use XSystemShellExecute:
 ReferenceXSystemShellExecute
 xSystemShellExecute(SystemShellExecute::create(
 ::comphelper::getProcessComponentContext() ) );
 xSystemShellExecute-execute( aFileName, OUString(),
 SystemShellExecuteFlags::URIS_ONLY );

 see svx/source/core/extedit.cxx method ExternalToolEdit::threadWorker as
 an example where it is used.

 As for path and filename in PDFExport::Export you get rFile as
 parameter - this is the location where the file will be written to.

 Regards, Tomaž




 On Sat, Apr 27, 2013 at 1:34 AM, Anurag Kanungo anuragkanu...@gmail.com
  wrote:


 Hi,

 In bug

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

 I was trying to resolve the bug , and got a little progress that
 whenever a user
 exports the pdf , i am able to open a particular fixed pdf file .

 In file filter/source/pdf/pdfexport.cxx,

 i used there system(xdg-open abc.pdf);   //xdg-open because it
 can work with any desktop environment (i guess)

 so it will always open abc.pdf file .



 I am not able to open the newly saved pdf file , as i require the
 location and the name of the new pdf to open it ,
 and i also require to convert string to const char* , as
 string.c_str(); doesn't worked there .

 Thank You .



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





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

[Libreoffice-commits] core.git: configure.ac distro-configs/LibreOfficeLinux.conf distro-configs/LibreOfficeMacOSX.conf distro-configs/LibreOfficeOpenBSD.conf distro-configs/LibreOfficeWin32.conf dist

[Tor Lillqvist]

 configure.ac   |2 +-
 distro-configs/LibreOfficeLinux.conf   |1 -
 distro-configs/LibreOfficeMacOSX.conf  |1 -
 distro-configs/LibreOfficeOpenBSD.conf |1 -
 distro-configs/LibreOfficeWin32.conf   |1 -
 distro-configs/LibreOfficeWin64.conf   |1 -
 6 files changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 788c152cc69a2dcb63c0dc1f1fa9ec093daa780b
Author: Tor Lillqvist t...@iki.fi
Date:   Tue Apr 30 12:12:13 2013 +0300

Revert Don't enable postgresql-sdbc by default

I simply didn't have the krb5-devel package installed, and assumed there was
something more complicated going on.

This reverts commit 0e1cc9968522b602c345aae33c4aac4c5bccd274.

Conflicts:
distro-configs/LibreOfficeWin64.conf

Change-Id: Ie3b226678862ed6388bcf1bf105da0b996f653d1

diff --git a/configure.ac b/configure.ac
index 548951b..bc20dec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7769,7 +7769,7 @@ fi
 dnl ===
 dnl Check for PostgreSQL stuff
 dnl ===
-if test $enable_postgresql_sdbc = yes; then
+if test x$enable_postgresql_sdbc != xno; then
 SCPDEFS=$SCPDEFS -DWITH_POSTGRESQL_SDBC
 
 if test $with_krb5 = yes -a $enable_openssl = no; then
diff --git a/distro-configs/LibreOfficeLinux.conf 
b/distro-configs/LibreOfficeLinux.conf
index b349db6..dbbdcb7 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -23,7 +23,6 @@
 --enable-dbus
 --enable-extension-integration
 --enable-opengl
---enable-postgresql-sdbc
 --enable-odk
 --enable-lockdown
 --enable-kde
diff --git a/distro-configs/LibreOfficeMacOSX.conf 
b/distro-configs/LibreOfficeMacOSX.conf
index 8ecbc82..367d4c8 100644
--- a/distro-configs/LibreOfficeMacOSX.conf
+++ b/distro-configs/LibreOfficeMacOSX.conf
@@ -7,7 +7,6 @@
 --enable-ext-nlpsolver
 --enable-extension-integration
 --enable-online-update
---enable-postgresql-sdbc
 --without-system-postgresql
 --disable-gtk
 --with-help
diff --git a/distro-configs/LibreOfficeOpenBSD.conf 
b/distro-configs/LibreOfficeOpenBSD.conf
index 9b2706c..6a52daf 100644
--- a/distro-configs/LibreOfficeOpenBSD.conf
+++ b/distro-configs/LibreOfficeOpenBSD.conf
@@ -12,7 +12,6 @@
 --enable-lockdown
 --enable-ext-presenter-minimizer
 --enable-ext-wiki-publisher
---enable-postgresql-sdbc
 --enable-python=system
 --with-alloc=system
 --with-ant-home=/usr/local/ant
diff --git a/distro-configs/LibreOfficeWin32.conf 
b/distro-configs/LibreOfficeWin32.conf
index e07584a..3e99f74 100644
--- a/distro-configs/LibreOfficeWin32.conf
+++ b/distro-configs/LibreOfficeWin32.conf
@@ -5,7 +5,6 @@
 --without-helppack-integration
 --enable-extension-integration
 --disable-gtk
---enable-postgresql-sdbc
 --enable-scripting-beanshell
 --enable-scripting-javascript
 --enable-ext-wiki-publisher
diff --git a/distro-configs/LibreOfficeWin64.conf 
b/distro-configs/LibreOfficeWin64.conf
index 7afbd60..ea31d83 100644
--- a/distro-configs/LibreOfficeWin64.conf
+++ b/distro-configs/LibreOfficeWin64.conf
@@ -1,5 +1,4 @@
 --enable-64-bit
---enable-postgresql-sdbc
 --disable-gtk
 --enable-scripting-beanshell
 --enable-scripting-javascript
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Thorsten Behrens]

 xmloff/source/text/txtimp.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cd09b5379e9370c66fe9d819dc3cd01dd30e3a91
Author: Thorsten Behrens tbehr...@suse.com
Date:   Tue Apr 30 11:20:01 2013 +0200

Fix fdo#64062 - can't assume para styles to be there.

Change-Id: I5da53ff44fdf00ec6c0fdf1a722f806971b6683a

diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 67cb1c7..4b15efc 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -1801,7 +1801,7 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
  style, if it has no direct list style property and (if 
exists) the
  automatic paragraph style has also no direct list style set.
 */
-if (m_pImpl-m_xParaStyles-hasByName(sStyleName))
+if (m_pImpl-m_xParaStyles.is()  
m_pImpl-m_xParaStyles-hasByName(sStyleName))
 {
 bool bOutlineStyleCandidate( false );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - 2 commits - sc/sdi sc/source sfx2/inc sfx2/sdi sfx2/source sw/sdi sw/source

[Jan Holesovsky]

 sc/sdi/scalc.sdi|3 ++
 sc/source/ui/app/scdll.cxx  |2 +
 sfx2/inc/sfx2/tbxctrl.hxx   |   30 ++--
 sfx2/sdi/sfx.sdi|3 ++
 sfx2/source/appl/appreg.cxx |1 
 sfx2/source/toolbox/tbxitem.cxx |   58 
 sw/sdi/swriter.sdi  |3 ++
 sw/source/ui/app/swmodule.cxx   |2 +
 8 files changed, 87 insertions(+), 15 deletions(-)

New commits:
commit d27159060290da5cebb8c1daea32042394ce59f1
Author: Jan Holesovsky ke...@suse.cz
Date:   Tue Apr 30 10:31:00 2013 +0200

bnc#816516: Implement easy access to the recent documents.

This adds a dropdown to the 'Open' toolbar tool.

Change-Id: I5b4aa99476e721c1479152b46bbc79cc0b095318

diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index 050c645..fa0c554 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -8140,6 +8140,9 @@ SfxVoidItem OpenFromCalc SID_OPEN_CALC
 RecordPerSet;
 Synchron;
 
+/* status: */
+SlotType = SfxStringItem
+
 /* config: */
 AccelConfig = TRUE,
 MenuConfig = TRUE,
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 3d84568..23abb13 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -180,6 +180,8 @@ void ScDLL::Init()
 ScMediaShell::RegisterInterface(pMod);
 ScPageBreakShell::RegisterInterface(pMod);
 
+SfxRecentFilesToolBoxControl::RegisterControl(SID_OPEN_CALC, pMod);
+
 //  eigene Controller
 ScTbxInsertCtrl ::RegisterControl(SID_TBXCTL_INSERT, pMod);
 ScTbxInsertCtrl ::RegisterControl(SID_TBXCTL_INSCELLS, pMod);
diff --git a/sfx2/inc/sfx2/tbxctrl.hxx b/sfx2/inc/sfx2/tbxctrl.hxx
index b8c1576..5791654 100644
--- a/sfx2/inc/sfx2/tbxctrl.hxx
+++ b/sfx2/inc/sfx2/tbxctrl.hxx
@@ -174,7 +174,7 @@ public:
 
 #define SFX_DECL_TOOLBOX_CONTROL() \
 static SfxToolBoxControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 
nId, ToolBox rTbx ); \
-static void RegisterControl(sal_uInt16 nSlotId = 0, SfxModule 
*pMod=NULL)
+static void SFX2_DLLPUBLIC RegisterControl(sal_uInt16 nSlotId = 0, 
SfxModule *pMod=NULL)
 
 /*  For special ToolBox controls, such as a font selection box or toolbox
 tear-off floating windows, an appropriate Item-Subclass of SfxTooBoxControl
@@ -366,6 +366,23 @@ private:
 sal_Boolm_bShowMenuImages;
 };
 
+/** Toolbox that implements recent files menu for the Open file toolbar button.
+
+To use that, the appropriate Sfx*Item (like Open, OpenFromCalc, or
+OpenFromWriter) has to have SlotType = SfxStringItem, and the appropriate
+module initialization has to call RegisterControl().
+*/
+class SfxRecentFilesToolBoxControl : public SfxToolBoxControl
+{
+public:
+SFX_DECL_TOOLBOX_CONTROL();
+SfxRecentFilesToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox 
rBox );
+virtual ~SfxRecentFilesToolBoxControl();
+
+protected:
+virtual SfxPopupWindow* CreatePopupWindow();
+};
+
 class SfxReloadToolBoxControl_Impl : public SfxToolBoxControl
 {
 protected:
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 396fbb7..6cefd9b 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -4255,6 +4255,9 @@ SfxObjectItem Open SID_OPENDOC
 RecordPerSet;
 Asynchron;
 
+/* status: */
+SlotType = SfxStringItem
+
 /* config: */
 AccelConfig = TRUE,
 MenuConfig = TRUE,
diff --git a/sfx2/source/appl/appreg.cxx b/sfx2/source/appl/appreg.cxx
index 070bf9f..8d963d4 100644
--- a/sfx2/source/appl/appreg.cxx
+++ b/sfx2/source/appl/appreg.cxx
@@ -71,6 +71,7 @@ void SfxApplication::Registrations_Impl()
 SfxURLToolBoxControl_Impl::RegisterControl(SID_OPENURL);
 SfxAppToolBoxControl_Impl::RegisterControl( SID_NEWDOCDIRECT );
 SfxAppToolBoxControl_Impl::RegisterControl( SID_AUTOPILOTMENU );
+SfxRecentFilesToolBoxControl::RegisterControl( SID_OPENDOC );
 };
 
 //
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 3573f4b..7ef50ba 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -34,7 +34,9 @@
 #include string   // prevent conflict with STL includes
 #include com/sun/star/uno/Reference.h
 #include com/sun/star/frame/XFrame.hpp
+#include com/sun/star/awt/XPopupMenu.hpp
 #include com/sun/star/awt/XWindow.hpp
+#include com/sun/star/awt/XWindowPeer.hpp
 #include com/sun/star/util/URL.hpp
 #include com/sun/star/util/XURLTransformer.hpp
 #include com/sun/star/frame/XController.hpp
@@ -45,6 +47,7 @@
 #include com/sun/star/beans/PropertyValue.hpp
 #include com/sun/star/beans/XPropertySet.hpp
 #include com/sun/star/frame/XLayoutManager.hpp
+#include com/sun/star/frame/XPopupMenuController.hpp
 #include com/sun/star/frame/status/ItemStatus.hpp
 #include com/sun/star/frame/status/ItemState.hpp
 #include com/sun/star/ui/XUIElementFactory.hpp
@@ -99,6 +102,7 @@
 #include 

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - xmloff/source

[Thorsten Behrens]

 xmloff/source/text/txtimp.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f4ba414e86b48a9b2b0439c5a5cf29042be4f7fd
Author: Thorsten Behrens tbehr...@suse.com
Date:   Tue Apr 30 11:20:01 2013 +0200

Fix fdo#64062 - can't assume para styles to be there.

Change-Id: I5da53ff44fdf00ec6c0fdf1a722f806971b6683a

diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index b48225a..3abafb5 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -1803,7 +1803,7 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
  style, if it has no direct list style property and (if 
exists) the
  automatic paragraph style has also no direct list style set.
 */
-if (m_pImpl-m_xParaStyles-hasByName(sStyleName))
+if (m_pImpl-m_xParaStyles.is()  
m_pImpl-m_xParaStyles-hasByName(sStyleName))
 {
 bool bOutlineStyleCandidate( false );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH libreoffice-4-0] Fix fdo#64062 - can't assume para styles to be there.

[Thorsten Behrens (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3694

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/94/3694/1

Fix fdo#64062 - can't assume para styles to be there.

Change-Id: I5da53ff44fdf00ec6c0fdf1a722f806971b6683a
---
M xmloff/source/text/txtimp.cxx
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index b48225a..3abafb5 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -1803,7 +1803,7 @@
  style, if it has no direct list style property and (if 
exists) the
  automatic paragraph style has also no direct list style set.
 */
-if (m_pImpl-m_xParaStyles-hasByName(sStyleName))
+if (m_pImpl-m_xParaStyles.is()  
m_pImpl-m_xParaStyles-hasByName(sStyleName))
 {
 bool bOutlineStyleCandidate( false );
 

-- 
To view, visit https://gerrit.libreoffice.org/3694
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5da53ff44fdf00ec6c0fdf1a722f806971b6683a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Thorsten Behrens tbehr...@suse.com

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

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

[Thorsten Behrens]

 xmloff/source/text/txtimp.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0252a22c43ec6d676c7d9a7ded0ec7064dede7c1
Author: Thorsten Behrens tbehr...@suse.com
Date:   Tue Apr 30 11:20:01 2013 +0200

Fix fdo#64062 - can't assume para styles to be there.

Change-Id: I5da53ff44fdf00ec6c0fdf1a722f806971b6683a
Reviewed-on: https://gerrit.libreoffice.org/3694
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi

diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index b48225a..3abafb5 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -1803,7 +1803,7 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
  style, if it has no direct list style property and (if 
exists) the
  automatic paragraph style has also no direct list style set.
 */
-if (m_pImpl-m_xParaStyles-hasByName(sStyleName))
+if (m_pImpl-m_xParaStyles.is()  
m_pImpl-m_xParaStyles-hasByName(sStyleName))
 {
 bool bOutlineStyleCandidate( false );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-4-0] Fix fdo#64062 - can't assume para styles to be there.

[Tor Lillqvist (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3694

Approvals:
  Tor Lillqvist: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3694
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5da53ff44fdf00ec6c0fdf1a722f806971b6683a
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Thorsten Behrens tbehr...@suse.com
Gerrit-Reviewer: Tor Lillqvist t...@iki.fi

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

[Libreoffice-commits] core.git: liblangtag/ExternalPackage_liblangtag_data.mk

[Julien Nabet]

 liblangtag/ExternalPackage_liblangtag_data.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 10839c68caea68218e9892c4884d920b1330a61b
Author: Julien Nabet serval2...@yahoo.fr
Date:   Mon Apr 29 23:12:49 2013 +0200

Forgot with_dir

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

diff --git a/liblangtag/ExternalPackage_liblangtag_data.mk 
b/liblangtag/ExternalPackage_liblangtag_data.mk
index a56211f..af4dac9 100644
--- a/liblangtag/ExternalPackage_liblangtag_data.mk
+++ b/liblangtag/ExternalPackage_liblangtag_data.mk
@@ -11,7 +11,7 @@ $(eval $(call 
gb_ExternalPackage_ExternalPackage,liblangtag_data,langtag))
 
 $(eval $(call gb_ExternalPackage_set_outdir,liblangtag_data,$(INSTDIR)))
 
-$(eval $(call 
gb_ExternalPackage_add_unpacked_files,liblangtag_data,share/liblangtag,\
+$(eval $(call 
gb_ExternalPackage_add_unpacked_files_with_dir,liblangtag_data,share/liblangtag,\
data/language-subtag-registry.xml \
data/common/bcp47/calendar.xml \
data/common/bcp47/collation.xml \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Forgot with_dir

[David Tardon (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3688

Approvals:
  David Tardon: Verified; Looks good to me, approved

Objections:
  Julien Nabet: This need some tweaks before it is merged


-- 
To view, visit https://gerrit.libreoffice.org/3688
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1457f5619984671e8cb88173d204d3157d3cb883
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet serval2...@yahoo.fr
Gerrit-Reviewer: David Tardon dtar...@redhat.com
Gerrit-Reviewer: Julien Nabet serval2...@yahoo.fr

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

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

[Miklos Vajna]

 writerfilter/source/dmapper/DomainMapper.cxx   |   28 +
 writerfilter/source/dmapper/DomainMapper_Impl.cxx  |   61 +
 writerfilter/source/dmapper/DomainMapper_Impl.hxx  |5 +
 writerfilter/source/dmapper/ModelEventListener.cxx |7 ++
 writerfilter/source/ooxml/model.xml|2 
 5 files changed, 103 insertions(+)

New commits:
commit 9cc1e7b165abe3f19c2919f8d9cf8efc3e8cf315
Author: Miklos Vajna vmik...@suse.cz
Date:   Tue Apr 30 11:44:03 2013 +0200

bnc#779630 initial DOCX import of w:sdt's w:dropDownList

Change-Id: I57d4768a26476d1a0535087c60535393b7004b24

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 4e07c47..4d6f905 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1435,6 +1435,14 @@ void DomainMapper::lcl_attribute(Id nName, Value  val)
 break;
 case NS_ooxml::LN_CT_SdtBlock_sdtEndContent:
 m_pImpl-SetSdt(false);
+if (!m_pImpl-m_aDropDownItems.empty())
+m_pImpl-createDropDownControl();
+break;
+case NS_ooxml::LN_CT_SdtListItem_displayText:
+// TODO handle when this is != value
+break;
+case NS_ooxml::LN_CT_SdtListItem_value:
+m_pImpl-m_aDropDownItems.push_back(sStringValue);
 break;
 default:
 {
@@ -3289,6 +3297,20 @@ void DomainMapper::sprmWithProps( Sprm rSprm, 
PropertyMapPtr rContext, SprmType
 }
 }
 break;
+case NS_ooxml::LN_CT_SdtPr_dropDownList:
+{
+writerfilter::ReferenceProperties::Pointer_t pProperties = 
rSprm.getProps();
+if (pProperties.get() != NULL)
+pProperties-resolve(*this);
+}
+break;
+case NS_ooxml::LN_CT_SdtDropDownList_listItem:
+{
+writerfilter::ReferenceProperties::Pointer_t pProperties = 
rSprm.getProps();
+if (pProperties.get() != NULL)
+pProperties-resolve(*this);
+}
+break;
 default:
 {
 #ifdef DEBUG_DOMAINMAPPER
@@ -3580,6 +3602,12 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, 
size_t len)
 aBuffer.append( (const sal_Unicode *) data_, len);
 sText = aBuffer.makeStringAndClear();
 
+if (!m_pImpl-m_aDropDownItems.empty())
+{
+m_pImpl-m_aSdtTexts.append(sText);
+return;
+}
+
 try
 {
 m_pImpl-getTableManager().utext(data_, len);
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 6de9889..854179f 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -53,6 +53,8 @@
 #include com/sun/star/util/XNumberFormatsSupplier.hpp
 #include com/sun/star/document/XViewDataSupplier.hpp
 #include com/sun/star/container/XIndexContainer.hpp
+#include com/sun/star/awt/XControlModel.hpp
+#include com/sun/star/drawing/XControlShape.hpp
 #include oox/mathml/import.hxx
 
 #ifdef DEBUG_DOMAINMAPPER
@@ -66,6 +68,8 @@
 
 #include comphelper/configurationhelper.hxx
 #include comphelper/stlunosequence.hxx
+#include vcl/svapp.hxx
+#include vcl/outdev.hxx
 
 using namespace ::com::sun::star;
 using namespace ::rtl;
@@ -3933,6 +3937,63 @@ bool DomainMapper_Impl::IsNewDoc()
 return m_bIsNewDoc;
 }
 
+/// w:sdt's w:dropDownList doesn't have width, so guess the size based on the 
longest string.
+awt::Size lcl_getOptimalWidth(StyleSheetTablePtr pStyleSheet, OUString 
rDefault, std::vectorOUString rItems)
+{
+OUString aLongest = rDefault;
+sal_Int32 nHeight = 0;
+for (size_t i = 0; i  rItems.size(); ++i)
+if (rItems[i].getLength()  aLongest.getLength())
+aLongest = rItems[i];
+
+MapMode aMap(MAP_100TH_MM);
+OutputDevice* pOut = Application::GetDefaultDevice();
+pOut-Push(PUSH_FONT | PUSH_MAPMODE);
+
+PropertyMapPtr pDefaultCharProps = pStyleSheet-GetDefaultCharProps();
+Font aFont(pOut-GetFont());
+PropertyMap::iterator aFontName = 
pDefaultCharProps-find(PropertyDefinition(PROP_CHAR_FONT_NAME, false));
+if (aFontName != pDefaultCharProps-end())
+aFont.SetName(aFontName-second.getOUString());
+PropertyMap::iterator aHeight = 
pDefaultCharProps-find(PropertyDefinition(PROP_CHAR_HEIGHT, false));
+if (aHeight != pDefaultCharProps-end())
+{
+nHeight = aHeight-second.getdouble() * 35; // points - mm100
+aFont.SetSize(Size(0, nHeight));
+}
+pOut-SetFont(aFont);
+pOut-SetMapMode(aMap);
+sal_Int32 nWidth = pOut-GetTextWidth(aLongest);
+
+pOut-Pop();
+// Width: space for the text + the square having the dropdown arrow.
+return awt::Size(nWidth + nHeight, nHeight);
+}
+
+void DomainMapper_Impl::createDropDownControl()
+{
+OUString aDefaultText = m_aSdtTexts.makeStringAndClear();
+uno::Referenceawt::XControlModel 

sd_regression_test failed

[Chris Sherlock]

Hi all,

I got the following unit test failure:

sd_regress_test failed:

[ CUT ] sd_regression_test
warn:legacy.osl:22656:1:ucb/source/core/provprox.cxx:384:
UcbContentProviderProxy::getContentProvider - No provider for
'com.sun.star.help.XMLHelp.
warn:legacy.osl:22656:1:ucb/source/core/provprox.cxx:384:
UcbContentProviderProxy::getContentProvider - No provider for
'com.sun.star.help.XMLHelp.
warn:legacy.osl:22656:1:ucb/source/core/provprox.cxx:384:
UcbContentProviderProxy::getContentProvider - No provider for
'com.sun.star.help.XMLHelp.
warn:sfx2.bastyp:22656:1:sfx2/source/bastyp/helper.cxx:119:
GetResultSet: Any other exception: Unable to create Content!
warn:legacy.osl:22656:1:ucb/source/core/provprox.cxx:384:
UcbContentProviderProxy::getContentProvider - No provider for
'com.sun.star.ucb.FileContentProvider.
warn:legacy.osl:22656:1:ucb/source/core/provprox.cxx:384:
UcbContentProviderProxy::getContentProvider - No provider for
'com.sun.star.ucb.FileContentProvider.
warn:legacy.osl:22656:1:ucb/source/core/provprox.cxx:384:
UcbContentProviderProxy::getContentProvider - No provider for
'com.sun.star.ucb.FileContentProvider.
warn:legacy.osl:22656:1:ucb/source/core/provprox.cxx:384:
UcbContentProviderProxy::getContentProvider - No provider for
'com.sun.star.ucb.FileContentProvider.
warn:legacy.osl:22656:1:ucb/source/core/provprox.cxx:384:
UcbContentProviderProxy::getContentProvider - No provider for
'com.sun.star.ucb.FileContentProvider.
warn:legacy.osl:22656:1:ucb/source/core/provprox.cxx:384:
UcbContentProviderProxy::getContentProvider - No provider for
'com.sun.star.ucb.FileContentProvider.
OK (2)
This used to be an assertion failure: Desktop disposed before terminating it,
but nothing bad seems to happen anyway?
This used to be an assertion failure: Desktop not terminated before
being destructed,
but it is probably not a real problem.
This used to be an assertion failure: Desktop disposed before terminating it,
but nothing bad seems to happen anyway?
This used to be an assertion failure: Desktop not terminated before
being destructed,
but it is probably not a real problem.
warn:legacy.osl:22656:1:unotools/source/config/configmgr.cxx:185:
OSL_ASSERT: items_.empty()
warn:legacy.osl:22656:3:sal/rtl/strtmpl.cxx:1226: OSL_ASSERT: *ppThis != NULL
Segmentation fault (core dumped)

Error: a unit test failed, please do one of:

export DEBUGCPPUNIT=TRUE# for exception catching
export GDBCPPUNITTRACE=gdb --args # for interactive debugging
export VALGRIND=memcheck# for memory checking
and retry.

It looks like 
/home/chris/repos/LibreOffice/core/solver/unxlngi6/bin/cppunit/cppunittester
generated a core file at
/home/chris/repos/LibreOffice/core/workdir/unxlngi6/CppunitTest/sd_uimpress.test.core/core
Backtraces:
[New LWP 22659]
[New LWP 22660]
[New LWP 22656]

warning: Can't read pathname for load map: Input/output error.
[Thread debugging using libthread_db enabled]
Using host libthread_db library /lib/i386-linux-gnu/libthread_db.so.1.

---

I have loaded up the coredump in gdb and done a backtrace:

chris@LibreOfficeDev:~/repos/LibreOffice/core/workdir/unxlngi6/CppunitTest/sd_uimpress.test.core$
gdb /home/chris/repos/LibreOffice/core/solver/unxlngi6/bin/cppunit/cppunittester
core
GNU gdb (GDB) 7.5-ubuntu
Copyright (C) 2012 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later http://gnu.org/licenses/gpl.html
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.  Type show copying
and show warranty for details.
This GDB was configured as i686-linux-gnu.
For bug reporting instructions, please see:
http://www.gnu.org/software/gdb/bugs/...
Reading symbols from
/home/chris/repos/LibreOffice/core/solver/unxlngi6/bin/cppunit/cppunittester...done.
[New LWP 22659]
[New LWP 22660]
[New LWP 22656]

warning: Can't read pathname for load map: Input/output error.
[Thread debugging using libthread_db enabled]
Using host libthread_db library /lib/i386-linux-gnu/libthread_db.so.1.
Core was generated by
`/home/chris/repos/LibreOffice/core/solver/unxlngi6/bin/cppunit/cppunittester
/h'.
Program terminated with signal 11, Segmentation fault.
#0  0x40082011 in rtl_string_newFromStr (ppThis=0x4e6ffdb8,
pCharStr=0x43a8b90d org.bluez) at
/home/chris/repos/LibreOffice/core/sal/rtl/strtmpl.cxx:1230
1230*pBuffer = *pCharStr;
(gdb) where
#0  0x40082011 in rtl_string_newFromStr (ppThis=0x4e6ffdb8,
pCharStr=0x43a8b90d org.bluez) at
/home/chris/repos/LibreOffice/core/sal/rtl/strtmpl.cxx:1230
#1  0x433898ab in rtl::OString::OStringchar const* (this=0x4e6ffdb8,
value=@0x4e6ffb84: 0x43a8b90d org.bluez) at
/home/chris/repos/LibreOffice/core/include/rtl/string.hxx:172
#2  0x43387b83 in rtl::OString::OStringchar const* (this=0x4e6ffdb8,
value=@0x4e6ffb84: 0x43a8b90d org.bluez) at
/home/chris/repos/LibreOffice/core/include/rtl/string.hxx:173
#3  0x439fa8ad in DBusObject::DBusObject (this=0x4e6ffdb8,
pBusName=0x43a8b90d org.bluez, 

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

[Tor Lillqvist]

 writerfilter/source/ooxml/OOXMLFastContextHandler.hxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 341ff124eca09ba3a2c8daad56134c2b65f2aca1
Author: Tor Lillqvist t...@iki.fi
Date:   Tue Apr 30 13:05:01 2013 +0300

WaE: private field 'mbShapeSent' is not used

Change-Id: I47ef674ec056d9a66c905420bf74b3e8a67840a9

diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx 
b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
index b1941b6..45e91e6 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
@@ -634,7 +634,6 @@ private:
 setId mMyNamespaces;
 setToken_t mMyTokens;
 OOXMLPropertySet::Pointer_t mpPropertySet;
-bool mbShapeSent;
 
 OOXMLFastContextHandler * getFastContextHandler() const;
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - distro-configs/AppUpSUSEWin32.conf distro-configs/SUSEWin32.conf

[Andras Timar]

 distro-configs/AppUpSUSEWin32.conf |1 +
 distro-configs/SUSEWin32.conf  |1 +
 2 files changed, 2 insertions(+)

New commits:
commit b1bb37d594ed623a0be5aedcd5c23a8cb6495809
Author: Andras Timar ati...@suse.com
Date:   Tue Apr 30 03:23:38 2013 -0700

--enable-mono for SUSE Windows builds

Change-Id: I1858585c6645b0f1bde6f798bb36461112918f1f

diff --git a/distro-configs/AppUpSUSEWin32.conf 
b/distro-configs/AppUpSUSEWin32.conf
index 5f5d9aa..7118daf 100644
--- a/distro-configs/AppUpSUSEWin32.conf
+++ b/distro-configs/AppUpSUSEWin32.conf
@@ -16,6 +16,7 @@
 --without-helppack-integration
 --enable-extension-integration
 --enable-activex
+--enable-mono
 --disable-online-update
 --disable-odk
 --disable-gtk
diff --git a/distro-configs/SUSEWin32.conf b/distro-configs/SUSEWin32.conf
index 8b31683..3e0d8b7 100644
--- a/distro-configs/SUSEWin32.conf
+++ b/distro-configs/SUSEWin32.conf
@@ -16,6 +16,7 @@
 --without-helppack-integration
 --enable-extension-integration
 --enable-activex
+--enable-mono
 --disable-online-update
 --disable-odk
 --disable-gtk
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jesús]

 scp2/source/base/registryitem_base.scp   |2 +-
 scp2/source/calc/registryitem_calc.scp   |8 
 scp2/source/draw/registryitem_draw.scp   |8 
 scp2/source/impress/registryitem_impress.scp |8 
 scp2/source/math/registryitem_math.scp   |4 ++--
 scp2/source/writer/registryitem_writer.scp   |   14 +++---
 vcl/unx/gtk/app/gtksys.cxx   |   12 
 vcl/unx/gtk/window/gtksalframe.cxx   |   11 +++
 8 files changed, 45 insertions(+), 22 deletions(-)

New commits:
commit 8d9337326745f3cd3ade623b3c01ad6e8e3e590d
Author: Jesús jcorr...@gmail.com
Date:   Sat Apr 27 19:26:46 2013 +0200

fdo#35785: LibreOffice is One for now

See developer mailing list for discussion, subject LibreOffice is one or
several applications?

Change-Id: I7a4a5a76f980eb458a2b6d4558a553b8508fd990
Reviewed-on: https://gerrit.libreoffice.org/3638
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi

diff --git a/scp2/source/base/registryitem_base.scp 
b/scp2/source/base/registryitem_base.scp
index d12ea13..bc5e23b 100644
--- a/scp2/source/base/registryitem_base.scp
+++ b/scp2/source/base/registryitem_base.scp
@@ -93,7 +93,7 @@ RegistryItem 
gid_Regitem_Openoffice_Databasedocument_1_AppUserModelID
 ComponentCondition = VersionNT = 601;
 Subkey = LibreOffice.DatabaseDocument.1;
 Name = AppUserModelID;
-Value = TheDocumentFoundation.LibreOffice.Base;
+Value = TheDocumentFoundation.LibreOffice;
 End
 
 RegistryItem gid_Regitem_Openoffice_Databasedocument_1_FriendlyTypeName
diff --git a/scp2/source/calc/registryitem_calc.scp 
b/scp2/source/calc/registryitem_calc.scp
index d5b5af2..6b4ae4f 100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -292,7 +292,7 @@ RegistryItem 
gid_Regitem_Soffice_Starcalcdocument_6_AppUserModelID
 ComponentCondition = VersionNT = 601;
 Subkey = soffice.StarCalcDocument.6;
 Name = AppUserModelID;
-Value = TheDocumentFoundation.LibreOffice.Calc;
+Value = TheDocumentFoundation.LibreOffice;
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_FriendlyTypeName
@@ -406,7 +406,7 @@ RegistryItem 
gid_Regitem_Soffice_Starcalctemplate_6_AppUserModelID
 ComponentCondition = VersionNT = 601;
 Subkey = soffice.StarCalcTemplate.6;
 Name = AppUserModelID;
-Value = TheDocumentFoundation.LibreOffice.Calc;
+Value = TheDocumentFoundation.LibreOffice;
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_FriendlyTypeName
@@ -713,7 +713,7 @@ RegistryItem 
gid_Regitem_Openoffice_Calcdocument_1_AppUserModelID
 ComponentCondition = VersionNT = 601;
 Subkey = LibreOffice.CalcDocument.1;
 Name = AppUserModelID;
-Value = TheDocumentFoundation.LibreOffice.Calc;
+Value = TheDocumentFoundation.LibreOffice;
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_FriendlyTypeName
@@ -919,7 +919,7 @@ RegistryItem 
gid_Regitem_Openoffice_Calctemplate_1_AppUserModelID
 ComponentCondition = VersionNT = 601;
 Subkey = LibreOffice.CalcTemplate.1;
 Name = AppUserModelID;
-Value = TheDocumentFoundation.LibreOffice.Calc;
+Value = TheDocumentFoundation.LibreOffice;
 End
 
 RegistryItem gid_Regitem_Openoffice_Calctemplate_1_FriendlyTypeName
diff --git a/scp2/source/draw/registryitem_draw.scp 
b/scp2/source/draw/registryitem_draw.scp
index 4e90016..2d8a676 100644
--- a/scp2/source/draw/registryitem_draw.scp
+++ b/scp2/source/draw/registryitem_draw.scp
@@ -292,7 +292,7 @@ RegistryItem 
gid_Regitem_Soffice_Stardrawdocument_6_AppUserModelID
 ComponentCondition = VersionNT = 601;
 Subkey = soffice.StarDrawDocument.6;
 Name = AppUserModelID;
-Value = TheDocumentFoundation.LibreOffice.Draw;
+Value = TheDocumentFoundation.LibreOffice;
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_FriendlyTypeName
@@ -406,7 +406,7 @@ RegistryItem 
gid_Regitem_Soffice_Stardrawtemplate_6_AppUserModelID
 ComponentCondition = VersionNT = 601;
 Subkey = soffice.StarDrawTemplate.6;
 Name = AppUserModelID;
-Value = TheDocumentFoundation.LibreOffice.Draw;
+Value = TheDocumentFoundation.LibreOffice;
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_FriendlyTypeName
@@ -713,7 +713,7 @@ RegistryItem 
gid_Regitem_Openoffice_Drawdocument_1_AppUserModelID
 ComponentCondition = VersionNT = 601;
 Subkey = LibreOffice.DrawDocument.1;
 Name = AppUserModelID;
-Value = TheDocumentFoundation.LibreOffice.Draw;
+Value = TheDocumentFoundation.LibreOffice;
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawdocument_1_FriendlyTypeName
@@ -919,7 +919,7 @@ RegistryItem 
gid_Regitem_Openoffice_Drawtemplate_1_AppUserModelID
 ComponentCondition = VersionNT = 601;
 Subkey = LibreOffice.DrawTemplate.1;
 Name = AppUserModelID;
-Value = TheDocumentFoundation.LibreOffice.Draw;
+Value = 

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

[Jesús Corrius]

 desktop/win32/source/applauncher/launcher.cxx |   40 +-
 1 file changed, 39 insertions(+), 1 deletion(-)

New commits:
commit 6c670f63a7859e24bdfa20759bd8b7c3b4a911ef
Author: Jesús Corrius jcorr...@gmail.com
Date:   Sat Apr 27 20:11:25 2013 +0200

fdo#35785: don't rely on the old apps fallback mechanism to fix this bug

Change-Id: Id0967358956868538f7563c51f7ed5e106771302
Reviewed-on: https://gerrit.libreoffice.org/3639
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi

diff --git a/desktop/win32/source/applauncher/launcher.cxx 
b/desktop/win32/source/applauncher/launcher.cxx
index 0edcdbf..c6a40d3 100644
--- a/desktop/win32/source/applauncher/launcher.cxx
+++ b/desktop/win32/source/applauncher/launcher.cxx
@@ -34,6 +34,9 @@
 #include stdlib.h
 #include malloc.h
 
+#define PACKVERSION(major,minor) MAKELONG(minor,major)
+#define APPUSERMODELID LTheDocumentFoundation.LibreOffice
+
 
 #ifdef __MINGW32__
 extern C int APIENTRY WinMain( HINSTANCE, HINSTANCE, LPSTR, int )
@@ -41,7 +44,42 @@ extern C int APIENTRY WinMain( HINSTANCE, HINSTANCE, 
LPSTR, int )
 extern C int APIENTRY _tWinMain( HINSTANCE, HINSTANCE, LPTSTR, int )
 #endif
 {
-// Retrieve startup info
+// Set an explicit Application User Model ID for the process
+
+WCHAR szShell32[MAX_PATH];
+GetSystemDirectoryW(szShell32, MAX_PATH);
+wcscat(szShell32, L\\Shell32.dll);
+
+HINSTANCE hinstDll = LoadLibraryW(szShell32);
+
+if(hinstDll)
+{
+DLLVERSIONINFO dvi;
+ZeroMemory(dvi, sizeof(dvi));
+dvi.cbSize = sizeof(dvi);
+
+DLLGETVERSIONPROC pDllGetVersion;
+pDllGetVersion = (DLLGETVERSIONPROC)GetProcAddress(hinstDll, 
DllGetVersion);
+HRESULT hr = (*pDllGetVersion)(dvi);
+
+if(SUCCEEDED(hr))
+{
+DWORD dwVersion = PACKVERSION(dvi.dwMajorVersion, 
dvi.dwMinorVersion);
+if(dwVersion = PACKVERSION(6,1)) // Shell32 version in Windows 7
+{
+typedef HRESULT (WINAPI 
*SETCURRENTPROCESSEXPLICITAPPUSERMODELID)(PCWSTR);
+SETCURRENTPROCESSEXPLICITAPPUSERMODELID 
pSetCurrentProcessExplicitAppUserModelID;
+pSetCurrentProcessExplicitAppUserModelID =
+
(SETCURRENTPROCESSEXPLICITAPPUSERMODELID)GetProcAddress(hinstDll, 
SetCurrentProcessExplicitAppUserModelID);
+
+if(pSetCurrentProcessExplicitAppUserModelID)
+(*pSetCurrentProcessExplicitAppUserModelID) 
(APPUSERMODELID);
+}
+}
+}
+FreeLibrary(hinstDll);
+
+// Retreive startup info
 
 STARTUPINFO aStartupInfo;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 54157] LibreOffice 4.0 most annoying bugs

[bugzilla-daemon]

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

Bug 54157 depends on bug 62815, which changed state.

Bug 62815 Summary: SLIDESHOW: Slideshow does not open
https://bugs.freedesktop.org/show_bug.cgi?id=62815

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

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

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

[László Németh]

 librelogo/source/LibreLogo/LibreLogo.py |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit adefbff4e4b3a58197fa358dd9d185b6826e58f3
Author: László Németh nem...@numbertext.org
Date:   Tue Apr 30 12:30:00 2013 +0200

fdo#64082 logo: fix hide/showturtle

Change-Id: I1aa1152940697f6390155871c0128519211abddd

diff --git a/librelogo/source/LibreLogo/LibreLogo.py 
b/librelogo/source/LibreLogo/LibreLogo.py
index 2fa250d..2231646 100644
--- a/librelogo/source/LibreLogo/LibreLogo.py
+++ b/librelogo/source/LibreLogo/LibreLogo.py
@@ -456,7 +456,7 @@ def __initialize__():
 _.doc.CurrentController.select(shape)
 shape.FillColor, transparence = __splitcolor__(_.areacolor)
 shape.LineColor, shape.LineTransparence = __splitcolor__(_.pencolor)
-else:
+elif shape.Visible:
 _.areacolor = shape.FillColor + (int(255.0 * 
shape.FillTransparence/100)  24)
 _.pencolor = shape.LineColor + (int(255.0 * 
shape.LineTransparence/100)  24)
 if shape.LineWidth != round((1 + _.pen * 2) * __PT_TO_TWIP__ / 
__MM10_TO_TWIP__) and shape.LineWidth != round(__LINEWIDTH__ / 
__MM10_TO_TWIP__):
@@ -513,7 +513,7 @@ def __visible__(shape, visible = -1): # for OOo 3.2 
compatibility
 
 def hideturtle():
 turtle = __getshape__(__TURTLE__)
-if turtle:
+if turtle and turtle.Visible:
 z = turtle.getPosition()
 z = __Point__(z.X + turtle.BoundRect.Width / 2.0, z.Y + 
turtle.BoundRect.Height / 2.0)
 turtle.PolyPolygon = __TURTLESHAPE__[1]
@@ -524,7 +524,7 @@ def hideturtle():
 
 def showturtle():
 turtle = __getshape__(__TURTLE__)
-if turtle:
+if turtle and not turtle.Visible:
 if not turtle.Parent:
 _.drawpage.add(turtle)
 z = turtle.getPosition()
@@ -532,12 +532,12 @@ def showturtle():
 turtle.PolyPolygon, turtle.RotateAngle = __TURTLESHAPE__[0], r
 z = __Point__(z.X - turtle.BoundRect.Width / 2.0, z.Y - 
turtle.BoundRect.Height / 2.0) 
 turtle.setPosition(z)
+__visible__(turtle, True)
 pencolor(_.pencolor)
 fillcolor(_.areacolor)
 pensize(_.pensize/__PT_TO_TWIP__)
-__visible__(turtle, True)
 _.doc.CurrentController.select(__getshape__(__TURTLE__))
-else:
+elif not turtle:
 __initialize__()
 
 def left(arg=None):
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] fdo#35785: don't rely on the old apps fallback mechanism to ...

[Tor Lillqvist (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3639

Approvals:
  Tor Lillqvist: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3639
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id0967358956868538f7563c51f7ed5e106771302
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Jesús Corrius jcorr...@gmail.com
Gerrit-Reviewer: Tor Lillqvist t...@iki.fi

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

[PUSHED] fdo#35785: LibreOffice is One for now

[Tor Lillqvist (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3638

Approvals:
  Tor Lillqvist: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3638
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7a4a5a76f980eb458a2b6d4558a553b8508fd990
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Jesús Corrius jcorr...@gmail.com
Gerrit-Reviewer: Tor Lillqvist t...@iki.fi

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

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

[Alia Almusaireae]

 sd/uiconfig/sdraw/ui/findandreplace.ui |  296 +
 1 file changed, 296 insertions(+)

New commits:
commit 85a7d9aa84ba07fa63a3647b7c2a10ed62b3336e
Author: Alia Almusaireae almusair...@kacst.edu.sa
Date:   Mon Apr 29 11:24:09 2013 +0300

findandreplace.ui widget

Change-Id: Ie1749714537182db6dec418db64ab4f945e7323e
Reviewed-on: https://gerrit.libreoffice.org/3654
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/sd/uiconfig/sdraw/ui/findandreplace.ui 
b/sd/uiconfig/sdraw/ui/findandreplace.ui
new file mode 100644
index 000..4dc51de
--- /dev/null
+++ b/sd/uiconfig/sdraw/ui/findandreplace.ui
@@ -0,0 +1,296 @@
+?xml version=1.0 encoding=UTF-8?
+interface
+  !-- interface-requires gtk+ 3.0 --
+  object class=GtkDialog id=findandreplace
+property name=can_focusFalse/property
+property name=border_width6/property
+property name=title translatable=yesFind amp; Replace/property
+property name=type_hintdialog/property
+child internal-child=vbox
+  object class=GtkBox id=dialog-vbox3
+property name=can_focusFalse/property
+property name=orientationvertical/property
+property name=spacing12/property
+child internal-child=action_area
+  object class=GtkButtonBox id=dialog-action_area3
+property name=can_focusFalse/property
+property name=layout_stylestart/property
+child
+  object class=GtkButton id=button1
+property name=label translatable=yesMore 
Option/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_action_appearanceFalse/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position0/property
+  /packing
+/child
+child
+  object class=GtkButton id=help
+property name=labelgtk-help/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_action_appearanceFalse/property
+property name=use_stockTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position1/property
+  /packing
+/child
+child
+  object class=GtkButton id=cancel
+property name=labelgtk-cancel/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_action_appearanceFalse/property
+property name=use_stockTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position2/property
+  /packing
+/child
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=pack_typeend/property
+property name=position0/property
+  /packing
+/child
+child
+  object class=GtkBox id=box1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=orientationvertical/property
+child
+  object class=GtkFrame id=frame1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=label_xalign0/property
+property name=shadow_typenone/property
+child
+  object class=GtkAlignment id=alignment1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=top_padding6/property
+property name=left_padding12/property
+child
+  object class=GtkBox id=box2
+property name=visibleTrue/property
+property name=can_focusFalse/property
+child
+  object class=GtkComboBox id=combobox1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+  /object
+  packing
+property 

[PUSHED] findandreplace.ui widget

[via Code Review]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3654

Approvals:
  Caolán McNamara: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3654
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie1749714537182db6dec418db64ab4f945e7323e
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Aliah Almusaireae almusair...@kacst.edu.sa
Gerrit-Reviewer: Caolán McNamara caol...@redhat.com

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

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

[Thorsten Behrens]

Noel Grandin wrote:
 Clang cleanup, unused mutex variables
 
 Some of these were doing nothing useful at all. I removed those.
 A couple were protecting static data, and I fixed those to use Mutex
 and MutexGuard properly.
 
 Change-Id: I444d13f8b6c50e526cce8d69d09aeaf240e5c6ca
 Reviewed-on: https://gerrit.libreoffice.org/3678
 Reviewed-by: Tor Lillqvist t...@iki.fi
 Tested-by: Tor Lillqvist t...@iki.fi
 
[snip]

 diff --git a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx 
 b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
 index 77487db..495c06f 100644
 --- a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
 +++ b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
 @@ -42,9 +42,10 @@ namespace drawinglayer
  static Primitive3DSequence aLineTubeList;
  static sal_uInt32 nLineTubeSegments(0L);
  static attribute::MaterialAttribute3D aLineMaterial;
 +static ::osl::Mutex aMutex;
  
  // may exclusively change static data, use mutex
 -::osl::Mutex m_mutex;
 +::osl::MutexGuard aGuard(aMutex);
  
Thanks a lot for that cleanup!

There are two more instances of that kind in this file though, and
beyond that - anyone eager to replace this with proper rtl::Static
(with the benefit of much faster subsequent access to the statics)?

Usage is rather nicely documented in include/rtl/instance.hxx - for
this case, StaticWithInit seems ideal.

Cheers,

-- Thorsten


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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - vcl/unx

[Michael Meeks]

 vcl/unx/gtk/app/gtksys.cxx  |   12 
 vcl/unx/gtk/window/gtkframe.cxx |   11 +++
 2 files changed, 23 insertions(+)

New commits:
commit ff3ce21011beda7c835db0979292d29dfa832d6b
Author: Michael Meeks michael.me...@suse.com
Date:   Tue Apr 30 11:19:56 2013 +0100

fdo#62815 - tolerate crazy / out-of-bound ScreenNumbers for FullScreen

Thus making the gtk+ backend more similar to the generic backend
in this regard; also be more strict about invalid monitors - empty
screens.

Change-Id: Ia4f2e1205cb1d309fb1bb01f9631167339a3478e

Signed-off-by: Petr Mladek pmla...@suse.cz

diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx
index bc06b25..c822fd2 100644
--- a/vcl/unx/gtk/app/gtksys.cxx
+++ b/vcl/unx/gtk/app/gtksys.cxx
@@ -70,6 +70,13 @@ struct GdkRectangleEqual
 
 }
 
+/**
+ * GtkSalSystem::countScreenMonitors()
+ *
+ * This method builds the vector which allows us to map from VCL's
+ * idea of linear integer ScreenNumber to to gtk+'s rather more
+ * complicated screen + monitor concept.
+ */
 void
 GtkSalSystem::countScreenMonitors()
 {
@@ -134,6 +141,11 @@ GtkSalSystem::getScreenMonitorFromIdx (int nIdx, gint 
nMonitor)
 break;
 }
 nMonitor = nIdx;
+
+// handle invalid monitor indexes as non-existent screens
+if (nMonitor  0 || (pScreen  nMonitor = gdk_screen_get_n_monitors 
(pScreen)))
+pScreen = NULL;
+
 return pScreen;
 }
 
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index eb87e74..d783e95 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -2059,7 +2059,15 @@ void GtkSalFrame::SetScreen( unsigned int nNewScreen, 
int eType, Rectangle *pSiz
 return;
 
 gint nMonitor;
+bool bSameMonitor = false;
 GdkScreen *pScreen = getDisplay()-getSystem()-getScreenMonitorFromIdx( 
nNewScreen, nMonitor );
+if (!pScreen)
+{
+g_warning (Attempt to move GtkSalFrame to invalid screen %d = 
+   fallback to current\n, nNewScreen);
+pScreen = gtk_widget_get_screen( m_pWindow );
+bSameMonitor = true;
+}
 
 // Heavy lifting, need to move screen ...
 if( pScreen != gtk_widget_get_screen( m_pWindow ))
@@ -2067,6 +2075,9 @@ void GtkSalFrame::SetScreen( unsigned int nNewScreen, int 
eType, Rectangle *pSiz
 
 gint nOldMonitor = gdk_screen_get_monitor_at_window(
 pScreen, widget_get_window( m_pWindow ) );
+if (bSameMonitor)
+nMonitor = nOldMonitor;
+
 #if OSL_DEBUG_LEVEL  1
 if( nMonitor == nOldMonitor )
 g_warning( An apparently pointless SetScreen - should we elide it ? 
);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH libreoffice-4-0-3] fdo#62815 - tolerate crazy / out-of-bound ScreenNumbers for ...

[Petr Mladek (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3695

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/95/3695/1

fdo#62815 - tolerate crazy / out-of-bound ScreenNumbers for FullScreen

Thus making the gtk+ backend more similar to the generic backend
in this regard; also be more strict about invalid monitors - empty
screens.

Change-Id: Ia4f2e1205cb1d309fb1bb01f9631167339a3478e
Signed-off-by: Petr Mladek pmla...@suse.cz
---
M vcl/unx/gtk/app/gtksys.cxx
M vcl/unx/gtk/window/gtkframe.cxx
2 files changed, 23 insertions(+), 0 deletions(-)



diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx
index bc06b25..c822fd2 100644
--- a/vcl/unx/gtk/app/gtksys.cxx
+++ b/vcl/unx/gtk/app/gtksys.cxx
@@ -70,6 +70,13 @@
 
 }
 
+/**
+ * GtkSalSystem::countScreenMonitors()
+ *
+ * This method builds the vector which allows us to map from VCL's
+ * idea of linear integer ScreenNumber to to gtk+'s rather more
+ * complicated screen + monitor concept.
+ */
 void
 GtkSalSystem::countScreenMonitors()
 {
@@ -134,6 +141,11 @@
 break;
 }
 nMonitor = nIdx;
+
+// handle invalid monitor indexes as non-existent screens
+if (nMonitor  0 || (pScreen  nMonitor = gdk_screen_get_n_monitors 
(pScreen)))
+pScreen = NULL;
+
 return pScreen;
 }
 
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 03f8c59..61d3f78 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -2059,7 +2059,15 @@
 return;
 
 gint nMonitor;
+bool bSameMonitor = false;
 GdkScreen *pScreen = getDisplay()-getSystem()-getScreenMonitorFromIdx( 
nNewScreen, nMonitor );
+if (!pScreen)
+{
+g_warning (Attempt to move GtkSalFrame to invalid screen %d = 
+   fallback to current\n, nNewScreen);
+pScreen = gtk_widget_get_screen( m_pWindow );
+bSameMonitor = true;
+}
 
 // Heavy lifting, need to move screen ...
 if( pScreen != gtk_widget_get_screen( m_pWindow ))
@@ -2067,6 +2075,9 @@
 
 gint nOldMonitor = gdk_screen_get_monitor_at_window(
 pScreen, widget_get_window( m_pWindow ) );
+if (bSameMonitor)
+nMonitor = nOldMonitor;
+
 #if OSL_DEBUG_LEVEL  1
 if( nMonitor == nOldMonitor )
 g_warning( An apparently pointless SetScreen - should we elide it ? 
);

-- 
To view, visit https://gerrit.libreoffice.org/3695
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia4f2e1205cb1d309fb1bb01f9631167339a3478e
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0-3
Gerrit-Owner: Petr Mladek pmla...@suse.cz
Gerrit-Reviewer: Michael Meeks michael.me...@suse.com

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

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - 2 commits - sc/sdi sc/source sfx2/inc sfx2/sdi sfx2/source sw/sdi sw/source

[Jan Holesovsky]

 sc/sdi/scalc.sdi|3 ++
 sc/source/ui/app/scdll.cxx  |2 +
 sfx2/inc/sfx2/tbxctrl.hxx   |   30 ++--
 sfx2/sdi/sfx.sdi|3 ++
 sfx2/source/appl/appreg.cxx |1 
 sfx2/source/toolbox/tbxitem.cxx |   58 
 sw/sdi/swriter.sdi  |3 ++
 sw/source/ui/app/swmodule.cxx   |2 +
 8 files changed, 87 insertions(+), 15 deletions(-)

New commits:
commit 328623a456c28c671c0e1ce5e833afbf7bbad498
Author: Jan Holesovsky ke...@suse.cz
Date:   Tue Apr 30 10:31:00 2013 +0200

bnc#816516: Implement easy access to the recent documents.

This adds a dropdown to the 'Open' toolbar tool.

Change-Id: I5b4aa99476e721c1479152b46bbc79cc0b095318

diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index 308eeda..a3d4079 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -8229,6 +8229,9 @@ SfxVoidItem OpenFromCalc SID_OPEN_CALC
 RecordPerSet;
 Synchron;
 
+/* status: */
+SlotType = SfxStringItem
+
 /* config: */
 AccelConfig = TRUE,
 MenuConfig = TRUE,
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 7b35091..2b5389d 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -167,6 +167,8 @@ void ScDLL::Init()
 ScMediaShell::RegisterInterface(pMod);
 ScPageBreakShell::RegisterInterface(pMod);
 
+SfxRecentFilesToolBoxControl::RegisterControl(SID_OPEN_CALC, pMod);
+
 //  eigene Controller
 ScTbxInsertCtrl ::RegisterControl(SID_TBXCTL_INSERT, pMod);
 ScTbxInsertCtrl ::RegisterControl(SID_TBXCTL_INSCELLS, pMod);
diff --git a/sfx2/inc/sfx2/tbxctrl.hxx b/sfx2/inc/sfx2/tbxctrl.hxx
index eee64c2..728cee9 100644
--- a/sfx2/inc/sfx2/tbxctrl.hxx
+++ b/sfx2/inc/sfx2/tbxctrl.hxx
@@ -163,7 +163,7 @@ public:
 
 #define SFX_DECL_TOOLBOX_CONTROL() \
 static SfxToolBoxControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 
nId, ToolBox rTbx ); \
-static void RegisterControl(sal_uInt16 nSlotId = 0, SfxModule 
*pMod=NULL)
+static void SFX2_DLLPUBLIC RegisterControl(sal_uInt16 nSlotId = 0, 
SfxModule *pMod=NULL)
 
 /*  For special ToolBox controls, such as a font selection box or toolbox
 tear-off floating windows, an appropriate Item-Subclass of SfxTooBoxControl
@@ -352,6 +352,23 @@ private:
 sal_Boolm_bShowMenuImages;
 };
 
+/** Toolbox that implements recent files menu for the Open file toolbar button.
+
+To use that, the appropriate Sfx*Item (like Open, OpenFromCalc, or
+OpenFromWriter) has to have SlotType = SfxStringItem, and the appropriate
+module initialization has to call RegisterControl().
+*/
+class SfxRecentFilesToolBoxControl : public SfxToolBoxControl
+{
+public:
+SFX_DECL_TOOLBOX_CONTROL();
+SfxRecentFilesToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox 
rBox );
+virtual ~SfxRecentFilesToolBoxControl();
+
+protected:
+virtual SfxPopupWindow* CreatePopupWindow();
+};
+
 class SfxReloadToolBoxControl_Impl : public SfxToolBoxControl
 {
 protected:
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 607f206..10ebaab 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -4385,6 +4385,9 @@ SfxObjectItem Open SID_OPENDOC
 RecordPerSet;
 Asynchron;
 
+/* status: */
+SlotType = SfxStringItem
+
 /* config: */
 AccelConfig = TRUE,
 MenuConfig = TRUE,
diff --git a/sfx2/source/appl/appreg.cxx b/sfx2/source/appl/appreg.cxx
index 0c54aa8..f3e7365 100644
--- a/sfx2/source/appl/appreg.cxx
+++ b/sfx2/source/appl/appreg.cxx
@@ -64,6 +64,7 @@ void SfxApplication::Registrations_Impl()
 SfxURLToolBoxControl_Impl::RegisterControl(SID_OPENURL);
 SfxAppToolBoxControl_Impl::RegisterControl( SID_NEWDOCDIRECT );
 SfxAppToolBoxControl_Impl::RegisterControl( SID_AUTOPILOTMENU );
+SfxRecentFilesToolBoxControl::RegisterControl( SID_OPENDOC );
 };
 
 //
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index d67b789..a16cc27 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -25,7 +25,9 @@
 #include string   // prevent conflict with STL includes
 #include com/sun/star/uno/Reference.h
 #include com/sun/star/frame/XFrame.hpp
+#include com/sun/star/awt/XPopupMenu.hpp
 #include com/sun/star/awt/XWindow.hpp
+#include com/sun/star/awt/XWindowPeer.hpp
 #include com/sun/star/util/URL.hpp
 #include com/sun/star/util/URLTransformer.hpp
 #include com/sun/star/util/XURLTransformer.hpp
@@ -37,6 +39,7 @@
 #include com/sun/star/beans/PropertyValue.hpp
 #include com/sun/star/beans/XPropertySet.hpp
 #include com/sun/star/frame/XLayoutManager.hpp
+#include com/sun/star/frame/XPopupMenuController.hpp
 #include com/sun/star/frame/status/ItemStatus.hpp
 #include com/sun/star/frame/status/ItemState.hpp
 #include com/sun/star/ui/XUIElementFactory.hpp
@@ -90,6 +93,7 @@
 #include 

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

[Miklos Vajna]

 writerfilter/source/ooxml/model.xml |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 84be52b5f6b8a73cefd740e0bfdd5f0622c369e4
Author: Miklos Vajna vmik...@suse.cz
Date:   Tue Apr 30 12:55:33 2013 +0200

bnc#779630 tokenize w:listItem and w:dropDownList

Change-Id: I714c2fd747eae2e706355b4fae892af9f569b3ae

diff --git a/writerfilter/source/ooxml/model.xml 
b/writerfilter/source/ooxml/model.xml
index d931874..458e26a 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -22769,6 +22769,13 @@
   element name=sdtEndPr tokenid=ooxml:CT_SdtRow_sdtEndPr/
   element name=sdtContent tokenid=ooxml:CT_SdtRow_sdtContent/
 /resource
+resource name=CT_SdtDropDownList resource=Properties tag=field
+  element name=listItem tokenid=ooxml:CT_SdtDropDownList_listItem/
+/resource
+resource name=CT_SdtListItem resource=Properties tag=field
+  attribute name=displayText 
tokenid=ooxml:CT_SdtListItem_displayText/
+  attribute name=value tokenid=ooxml:CT_SdtListItem_value/
+/resource
 resource name=CT_Attr resource=Properties tag=content
   attribute name=uri tokenid=ooxml:CT_Attr_uri/
   attribute name=name tokenid=ooxml:CT_Attr_name/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH libreoffice-4-0] fdo#64082 logo: fix hide/showturtle

[via Code Review]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3696

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/96/3696/1

fdo#64082 logo: fix hide/showturtle

Change-Id: I1aa1152940697f6390155871c0128519211abddd
---
M librelogo/source/LibreLogo/LibreLogo.py
1 file changed, 5 insertions(+), 5 deletions(-)



diff --git a/librelogo/source/LibreLogo/LibreLogo.py 
b/librelogo/source/LibreLogo/LibreLogo.py
index 2fa250d..2231646 100644
--- a/librelogo/source/LibreLogo/LibreLogo.py
+++ b/librelogo/source/LibreLogo/LibreLogo.py
@@ -456,7 +456,7 @@
 _.doc.CurrentController.select(shape)
 shape.FillColor, transparence = __splitcolor__(_.areacolor)
 shape.LineColor, shape.LineTransparence = __splitcolor__(_.pencolor)
-else:
+elif shape.Visible:
 _.areacolor = shape.FillColor + (int(255.0 * 
shape.FillTransparence/100)  24)
 _.pencolor = shape.LineColor + (int(255.0 * 
shape.LineTransparence/100)  24)
 if shape.LineWidth != round((1 + _.pen * 2) * __PT_TO_TWIP__ / 
__MM10_TO_TWIP__) and shape.LineWidth != round(__LINEWIDTH__ / 
__MM10_TO_TWIP__):
@@ -513,7 +513,7 @@
 
 def hideturtle():
 turtle = __getshape__(__TURTLE__)
-if turtle:
+if turtle and turtle.Visible:
 z = turtle.getPosition()
 z = __Point__(z.X + turtle.BoundRect.Width / 2.0, z.Y + 
turtle.BoundRect.Height / 2.0)
 turtle.PolyPolygon = __TURTLESHAPE__[1]
@@ -524,7 +524,7 @@
 
 def showturtle():
 turtle = __getshape__(__TURTLE__)
-if turtle:
+if turtle and not turtle.Visible:
 if not turtle.Parent:
 _.drawpage.add(turtle)
 z = turtle.getPosition()
@@ -532,12 +532,12 @@
 turtle.PolyPolygon, turtle.RotateAngle = __TURTLESHAPE__[0], r
 z = __Point__(z.X - turtle.BoundRect.Width / 2.0, z.Y - 
turtle.BoundRect.Height / 2.0) 
 turtle.setPosition(z)
+__visible__(turtle, True)
 pencolor(_.pencolor)
 fillcolor(_.areacolor)
 pensize(_.pensize/__PT_TO_TWIP__)
-__visible__(turtle, True)
 _.doc.CurrentController.select(__getshape__(__TURTLE__))
-else:
+elif not turtle:
 __initialize__()
 
 def left(arg=None):

-- 
To view, visit https://gerrit.libreoffice.org/3696
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1aa1152940697f6390155871c0128519211abddd
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Németh László nem...@numbertext.org

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

Re: sd_regression_test failed

[Markus Mohrhard]

Hey,

 sd_regress_test failed:

 [ CUT ] sd_regression_test
 warn:legacy.osl:22656:1:ucb/source/core/provprox.cxx:384: 
 UcbContentProviderProxy::getContentProvider - No provider for 
 'com.sun.star.help.XMLHelp.
 warn:legacy.osl:22656:1:ucb/source/core/provprox.cxx:384: 
 UcbContentProviderProxy::getContentProvider - No provider for 
 'com.sun.star.help.XMLHelp.
 warn:legacy.osl:22656:1:ucb/source/core/provprox.cxx:384: 
 UcbContentProviderProxy::getContentProvider - No provider for 
 'com.sun.star.help.XMLHelp.
 warn:sfx2.bastyp:22656:1:sfx2/source/bastyp/helper.cxx:119: GetResultSet: Any 
 other exception: Unable to create Content!
 warn:legacy.osl:22656:1:ucb/source/core/provprox.cxx:384: 
 UcbContentProviderProxy::getContentProvider - No provider for 
 'com.sun.star.ucb.FileContentProvider.
 warn:legacy.osl:22656:1:ucb/source/core/provprox.cxx:384: 
 UcbContentProviderProxy::getContentProvider - No provider for 
 'com.sun.star.ucb.FileContentProvider.
 warn:legacy.osl:22656:1:ucb/source/core/provprox.cxx:384: 
 UcbContentProviderProxy::getContentProvider - No provider for 
 'com.sun.star.ucb.FileContentProvider.
 warn:legacy.osl:22656:1:ucb/source/core/provprox.cxx:384: 
 UcbContentProviderProxy::getContentProvider - No provider for 
 'com.sun.star.ucb.FileContentProvider.
 warn:legacy.osl:22656:1:ucb/source/core/provprox.cxx:384: 
 UcbContentProviderProxy::getContentProvider - No provider for 
 'com.sun.star.ucb.FileContentProvider.
 warn:legacy.osl:22656:1:ucb/source/core/provprox.cxx:384: 
 UcbContentProviderProxy::getContentProvider - No provider for 
 'com.sun.star.ucb.FileContentProvider.
 OK (2)
 This used to be an assertion failure: Desktop disposed before terminating it,
 but nothing bad seems to happen anyway?
 This used to be an assertion failure: Desktop not terminated before being 
 destructed,
 but it is probably not a real problem.
 This used to be an assertion failure: Desktop disposed before terminating it,
 but nothing bad seems to happen anyway?
 This used to be an assertion failure: Desktop not terminated before being 
 destructed,
 but it is probably not a real problem.
 warn:legacy.osl:22656:1:unotools/source/config/configmgr.cxx:185: OSL_ASSERT: 
 items_.empty()
 warn:legacy.osl:22656:3:sal/rtl/strtmpl.cxx:1226: OSL_ASSERT: *ppThis != NULL
 Segmentation fault (core dumped)



As already mentioned on IRC this looks like you ran out of memory.

warn:legacy.osl:22656:3:sal/rtl/strtmpl.cxx:1226: OSL_ASSERT: *ppThis != NULL

means that the memory allocation in the line before failed. Please
check that you have enough memory to run the test and link some libs
at the same time or disable parallelism.

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

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

[Matúš Kukan]

 Repository.mk   |   19 ---
 solenv/gbuild/Helper.mk |2 +-
 solenv/gbuild/platform/IOS_ARM_GCC.mk   |5 +
 solenv/gbuild/platform/WNT_INTEL_GCC.mk |3 ---
 solenv/gbuild/platform/android.mk   |2 --
 solenv/gbuild/platform/com_MSC_class.mk |2 --
 solenv/gbuild/platform/macosx.mk|2 --
 solenv/gbuild/platform/solaris.mk   |2 --
 solenv/gbuild/platform/unxgcc.mk|2 --
 9 files changed, 10 insertions(+), 29 deletions(-)

New commits:
commit 22e1a5b836b898298b6a5cfbaf1c82d9c3f08349
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Tue Apr 30 12:39:05 2013 +0200

gbuild: UNOLIBS_OOO group is no more

Change-Id: I1b239844391c0d59fc26e44f789cc39ed602f54b

diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 0ca26a0..3130bf7 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -117,7 +117,7 @@ endef
 
 define gb_Helper_init_registries
 gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE
-gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO 
RTVERLIBS UNOLIBS_URE UNOLIBS_OOO UNOVERLIBS EXTENSIONLIBS
+gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO 
RTVERLIBS UNOLIBS_URE UNOVERLIBS EXTENSIONLIBS
 gb_Library_VALIDINSTALLMODULES := OOO URE WRITER
 gb_StaticLibrary_VALIDGROUPS := PLAINLIBS
 gb_Jar_VALIDGROUPS := URE OOO OXT
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk 
b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index 998cc6f..13a9b08 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -95,8 +95,7 @@ gb_LinkTarget_OBJCFLAGS += $(gb_DEBUG_CFLAGS)
 endif
 
 define gb_LinkTarget__get_liblinkflags
-$(patsubst lib%.a,-l%,$(foreach lib,$(filter-out 
$(gb_Library_UNOLIBS_OOO),$(1)),$(call gb_Library_get_filename,$(lib \
-$(foreach lib,$(filter 
$(gb_Library_UNOLIBS_OOO),$(1)),$(SOLARVER)/$(INPATH)/lib/$(lib)$(gb_Library_UNOEXT))
+$(patsubst lib%.a,-l%,$(foreach lib,$(1),$(call 
gb_Library_get_filename,$(lib \
 endef
 
 define gb_LinkTarget__get_layer
@@ -178,7 +177,6 @@ gb_Library_FILENAMES := \
$(foreach 
lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT))
 \
$(foreach 
lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT))
 \
$(foreach 
lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
-   $(foreach 
lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
$(foreach 
lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT))
 \
$(foreach 
lib,$(gb_Library_EXTENSIONLIBS),$(lib):$(lib)$(gb_Library_UNOEXT)) \
 
@@ -189,7 +187,6 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):OOO) \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):OOO) \
-   $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):OOO) \
$(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \
 
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk 
b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 8df958f..29aa4af 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -222,7 +222,6 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
-   $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
$(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \
 
@@ -233,7 +232,6 @@ gb_Library_FILENAMES :=\
$(foreach 
lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT))
 \
$(foreach 
lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTVEREXT))
 \
$(foreach 
lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
-   $(foreach 
lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
$(foreach 
lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT))
 \
$(foreach 
lib,$(gb_Library_EXTENSIONLIBS),$(lib):$(lib)$(gb_Library_UNOEXT)) \
 
@@ -245,7 +243,6 @@ gb_Library_DLLFILENAMES :=\
$(foreach 
lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(lib)$(gb_Library_DLLEXT)) \
$(foreach 
lib,$(gb_Library_RTVERLIBS),$(lib):$(lib)$(gb_Library_RTVERDLLEXT)) \
$(foreach 
lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNODLLEXT)) \
-   $(foreach 
lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNODLLEXT)) \
$(foreach 
lib,$(gb_Library_UNOVERLIBS),$(lib):$(lib)$(gb_Library_UNOVERDLLEXT)) \
$(foreach 

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

[Michael Meeks]

 vcl/unx/gtk/app/gtksys.cxx  |   12 
 vcl/unx/gtk/window/gtkframe.cxx |   11 +++
 2 files changed, 23 insertions(+)

New commits:
commit 791a8f2a4ca97302dd89ebda00f1eea83392a8b1
Author: Michael Meeks michael.me...@suse.com
Date:   Tue Apr 30 11:19:56 2013 +0100

fdo#62815 - tolerate crazy / out-of-bound ScreenNumbers for FullScreen

Thus making the gtk+ backend more similar to the generic backend
in this regard; also be more strict about invalid monitors - empty
screens.

Change-Id: Ia4f2e1205cb1d309fb1bb01f9631167339a3478e
Signed-off-by: Petr Mladek pmla...@suse.cz
Reviewed-on: https://gerrit.libreoffice.org/3695
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com

diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx
index bc06b25..c822fd2 100644
--- a/vcl/unx/gtk/app/gtksys.cxx
+++ b/vcl/unx/gtk/app/gtksys.cxx
@@ -70,6 +70,13 @@ struct GdkRectangleEqual
 
 }
 
+/**
+ * GtkSalSystem::countScreenMonitors()
+ *
+ * This method builds the vector which allows us to map from VCL's
+ * idea of linear integer ScreenNumber to to gtk+'s rather more
+ * complicated screen + monitor concept.
+ */
 void
 GtkSalSystem::countScreenMonitors()
 {
@@ -134,6 +141,11 @@ GtkSalSystem::getScreenMonitorFromIdx (int nIdx, gint 
nMonitor)
 break;
 }
 nMonitor = nIdx;
+
+// handle invalid monitor indexes as non-existent screens
+if (nMonitor  0 || (pScreen  nMonitor = gdk_screen_get_n_monitors 
(pScreen)))
+pScreen = NULL;
+
 return pScreen;
 }
 
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 03f8c59..61d3f78 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -2059,7 +2059,15 @@ void GtkSalFrame::SetScreen( unsigned int nNewScreen, 
int eType, Rectangle *pSiz
 return;
 
 gint nMonitor;
+bool bSameMonitor = false;
 GdkScreen *pScreen = getDisplay()-getSystem()-getScreenMonitorFromIdx( 
nNewScreen, nMonitor );
+if (!pScreen)
+{
+g_warning (Attempt to move GtkSalFrame to invalid screen %d = 
+   fallback to current\n, nNewScreen);
+pScreen = gtk_widget_get_screen( m_pWindow );
+bSameMonitor = true;
+}
 
 // Heavy lifting, need to move screen ...
 if( pScreen != gtk_widget_get_screen( m_pWindow ))
@@ -2067,6 +2075,9 @@ void GtkSalFrame::SetScreen( unsigned int nNewScreen, int 
eType, Rectangle *pSiz
 
 gint nOldMonitor = gdk_screen_get_monitor_at_window(
 pScreen, widget_get_window( m_pWindow ) );
+if (bSameMonitor)
+nMonitor = nOldMonitor;
+
 #if OSL_DEBUG_LEVEL  1
 if( nMonitor == nOldMonitor )
 g_warning( An apparently pointless SetScreen - should we elide it ? 
);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] fdo#60949: move last UNOLIBS_OOO to OOOLIBS

[via Code Review]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3682


-- 
To view, visit https://gerrit.libreoffice.org/3682
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I79af32f188a0e7de71ec8e6743fe73b3bb030a3f
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza marcos.souza@gmail.com
Gerrit-Reviewer: Matúš Kukan matus.ku...@gmail.com
Gerrit-Reviewer: Tor Lillqvist t...@iki.fi

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

[PUSHED libreoffice-4-0-3] fdo#62815 - tolerate crazy / out-of-bound ScreenNumbers for ...

[via Code Review]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3695

Approvals:
  Caolán McNamara: Verified; Looks good to me, approved
  Fridrich Strba: Looks good to me, but someone else must approve


-- 
To view, visit https://gerrit.libreoffice.org/3695
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia4f2e1205cb1d309fb1bb01f9631167339a3478e
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0-3
Gerrit-Owner: Petr Mladek pmla...@suse.cz
Gerrit-Reviewer: Caolán McNamara caol...@redhat.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org
Gerrit-Reviewer: Michael Meeks michael.me...@suse.com

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

[Libreoffice-commits] core.git: helpcontent2

[Caolán McNamara]

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

New commits:
commit a965e08c07d526c4054300a9bfca30ab7756ab2c
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Apr 30 12:16:11 2013 +0100

Updated core
Project: help  c64ceaae688be1f6cedcd942d0e3ab35e2060a2c

diff --git a/helpcontent2 b/helpcontent2
index eddac30..c64ceaa 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit eddac30b5afa84c2420a553d2e822722dc857228
+Subproject commit c64ceaae688be1f6cedcd942d0e3ab35e2060a2c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst   |   30 ---
 source/text/shared/01/0210.xhp |   96 +++--
 source/text/shared/01/02100100.xhp |8 +--
 3 files changed, 44 insertions(+), 90 deletions(-)

New commits:
commit c64ceaae688be1f6cedcd942d0e3ab35e2060a2c
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Apr 30 12:16:11 2013 +0100

update help ids for findreplace .ui conversion

Change-Id: I8ea54748382b2a4c4b5a9e762de49c245b69e5d3

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 47bd31e..8f44d26 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -7292,17 +7292,6 @@ svx_CheckBox_RID_SVXDLG_RUBY_CB_AUTO_DETECT,2315371521,
 svx_CheckBox_RID_SVXDLG_SEARCHFORM_CB_HALFFULLFORMS,1368769544,
 svx_CheckBox_RID_SVXDLG_SEARCHFORM_CB_SOUNDSLIKECJK,1368769545,
 svx_CheckBox_RID_SVXDLG_SEARCHSIMILARITY_CB_RELAX,1237959695,
-svx_CheckBox_RID_SVXDLG_SEARCH_CB_ALL_SHEETS,2311652411,
-svx_CheckBox_RID_SVXDLG_SEARCH_CB_BACKWARDS,2311652394,
-svx_CheckBox_RID_SVXDLG_SEARCH_CB_JAP_MATCH_FULL_HALF_WIDTH,2311652399,
-svx_CheckBox_RID_SVXDLG_SEARCH_CB_JAP_SOUNDS_LIKE,2311652400,
-svx_CheckBox_RID_SVXDLG_SEARCH_CB_LAYOUTS,2311652398,
-svx_CheckBox_RID_SVXDLG_SEARCH_CB_MATCH_CASE,2311652377,
-svx_CheckBox_RID_SVXDLG_SEARCH_CB_NOTES,2311652412,
-svx_CheckBox_RID_SVXDLG_SEARCH_CB_REGEXP,2311652395,
-svx_CheckBox_RID_SVXDLG_SEARCH_CB_SELECTIONS,2311652393,
-svx_CheckBox_RID_SVXDLG_SEARCH_CB_SIMILARITY,2311652396,
-svx_CheckBox_RID_SVXDLG_SEARCH_CB_WHOLE_WORDS,2311652378,
 svx_CheckBox_RID_SVXDLG_SPELLCHECK_CB_CHECK_GRAMMAR,2311849014,
 svx_CheckBox_RID_SVXPAGE_ALIGN_PARAGRAPH_CB_EXPAND,703775795,
 svx_CheckBox_RID_SVXPAGE_ALIGN_PARAGRAPH_CB_SNAP,703775782,
@@ -7379,8 +7368,6 @@ svx_ComboBox_DLG_DOCUMENTLINK_CMB_URL,1346113537,
 svx_ComboBox_RID_SVXDLG_ADD_INSTANCE_ED_INST_URL,1368952846,
 svx_ComboBox_RID_SVXDLG_IMAPURL_CBB_TARGETS,1244991489,
 svx_ComboBox_RID_SVXDLG_IMAP_CBB_URL,2318700545,
-svx_ComboBox_RID_SVXDLG_SEARCH_ED_REPLACE,2311655440,
-svx_ComboBox_RID_SVXDLG_SEARCH_ED_SEARCH,2311655435,
 svx_ComboBox_RID_SVXPAGE_HYPERLINK_DOCUMENT_CB_FRAME,704483360,
 svx_ComboBox_RID_SVXPAGE_HYPERLINK_INTERNET_CB_FRAME,704450592,
 svx_ComboBox_RID_SVXPAGE_HYPERLINK_MAIL_CB_FRAME,704466976,
@@ -7590,9 +7577,6 @@ svx_ListBox_RID_SVXDLG_RUBY_LB_ADJUST,2315374103,
 svx_ListBox_RID_SVXDLG_RUBY_LB_CHAR_STYLE,2315374083,
 svx_ListBox_RID_SVXDLG_RUBY_LB_POSITION,2315374105,
 svx_ListBox_RID_SVXDLG_SEARCHFORM_LB_FORM,1368772097,
-svx_ListBox_RID_SVXDLG_SEARCH_LB_CALC_SEARCHIN,2311654967,
-svx_ListBox_RID_SVXDLG_SEARCH_LB_REPLACE,2311654929,
-svx_ListBox_RID_SVXDLG_SEARCH_LB_SEARCH,2311654924,
 svx_ListBox_RID_SVXDLG_SPELLCHECK_LB_LANGUAGE,2311851556,
 svx_ListBox_RID_SVXDLG_SPELLCHECK_LB_SUGGESTION,2311851552,
 svx_ListBox_RID_SVXFLOAT_3D_LB_AMBIENTLIGHT,3388493390,
@@ -7833,7 +7817,6 @@ 
svx_ModalDialog_RID_SVX_MDLG_FONTWORK_CHARSPACING,1237893120,
 svx_ModalDialog_RID_SVX_MDLG_FONTWORK_GALLERY,1237614592,
 svx_ModalDialog_RID_SVX_SPLITCELLDLG,1238286336,
 svx_ModelessDialog_RID_SVXDLG_IMAP,2318696448,
-svx_MoreButton_RID_SVXDLG_SEARCH_BTN_MORE,2311664159,
 svx_MultiLineEdit_MD_ICONCHANGE_EDT_ADDR,1080609701,
 svx_MultiLineEdit_MD_INSERT_OBJECT_APPLET_ED_APPLET_OPTIONS,1598179860,
 svx_MultiLineEdit_RID_SVXDLG_ADD_CONDITION_ED_CONDITION,1368869387,
@@ -7943,17 +7926,6 @@ 
svx_PushButton_RID_SVXDLG_NAMESPACE_ITEM_PB_EDIT_NAMESPACE,1368887821,
 svx_PushButton_RID_SVXDLG_RUBY_PB_CLOSE,2315375112,
 svx_PushButton_RID_SVXDLG_RUBY_PB_STYLIST,2315375108,
 svx_PushButton_RID_SVXDLG_SEARCHFORM_PB_SOUNDSLIKESETTINGS,1368773123,
-svx_PushButton_RID_SVXDLG_SEARCH_BTN_ATTRIBUTE,2311655986,
-svx_PushButton_RID_SVXDLG_SEARCH_BTN_COMPONENT_1,2311655964,
-svx_PushButton_RID_SVXDLG_SEARCH_BTN_COMPONENT_2,2311655965,
-svx_PushButton_RID_SVXDLG_SEARCH_BTN_FORMAT,2311655987,
-svx_PushButton_RID_SVXDLG_SEARCH_BTN_NOFORMAT,2311655988,
-svx_PushButton_RID_SVXDLG_SEARCH_BTN_REPLACE,2311655959,
-svx_PushButton_RID_SVXDLG_SEARCH_BTN_REPLACE_ALL,2311655960,
-svx_PushButton_RID_SVXDLG_SEARCH_BTN_SEARCH,2311655956,
-svx_PushButton_RID_SVXDLG_SEARCH_BTN_SEARCH_ALL,2311655957,
-svx_PushButton_RID_SVXDLG_SEARCH_PB_JAP_OPTIONS,2311655985,
-svx_PushButton_RID_SVXDLG_SEARCH_PB_SIMILARITY,2311655981,
 svx_PushButton_RID_SVXDLG_SPELLCHECK_PB_AUTOCORR,2311852586,
 svx_PushButton_RID_SVXDLG_SPELLCHECK_PB_CHANGE,2311852584,
 svx_PushButton_RID_SVXDLG_SPELLCHECK_PB_CHANGEALL,2311852585,
@@ -8043,8 +8015,6 @@ 
svx_RadioButton_RID_SVXDLG_SEARCHFORM_RB_SEARCHFORNOTNULL,1368769029,
 svx_RadioButton_RID_SVXDLG_SEARCHFORM_RB_SEARCHFORNULL,1368769028,
 svx_RadioButton_RID_SVXDLG_SEARCHFORM_RB_SEARCHFORTEXT,1368769027,
 svx_RadioButton_RID_SVXDLG_SEARCHFORM_RB_SINGLEFIELD,1368769026,
-svx_RadioButton_RID_SVXDLG_SEARCH_RB_CALC_COLUMNS,2311651898,
-svx_RadioButton_RID_SVXDLG_SEARCH_RB_CALC_ROWS,2311651897,
 svx_RadioButton_RID_SVXPAGE_ALIGN_PARAGRAPH_BTN_CENTERALIGN,703775264,
 

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

[Thorsten Behrens]

 filter/source/svg/svgwriter.cxx |  240 
 1 file changed, 26 insertions(+), 214 deletions(-)

New commits:
commit 417869b0c3569ad657c02879fca01dc582d93d76
Author: Thorsten Behrens tbehr...@suse.com
Date:   Tue Apr 30 13:31:44 2013 +0200

Kill reams of duplicated code in svg export.

Change-Id: I381b2c5859f00cdd27736c50b39c6c6e50e39890

diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index a223a2b..410215a 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -873,7 +873,6 @@ sal_Bool SVGTextWriter::nextParagraph()
 mbIsNewListItem = sal_False;
 mbIsListLevelStyleImage = sal_False;
 
-#if OSL_DEBUG_LEVEL  0
 if( mrParagraphEnumeration.is()  
mrParagraphEnumeration-hasMoreElements() )
 {
 Reference  XTextContent   xTextContent( 
mrParagraphEnumeration-nextElement(), UNO_QUERY_THROW );
@@ -882,7 +881,9 @@ sal_Bool SVGTextWriter::nextParagraph()
 Reference XServiceInfo  xServiceInfo( xTextContent, 
UNO_QUERY_THROW );
 if( xServiceInfo.is() )
 {
+#if OSL_DEBUG_LEVEL  0
 OUString sInfo;
+#endif
 if( xServiceInfo-supportsService( 
com.sun.star.text.Paragraph ) )
 {
 mrCurrentTextParagraph.set( xTextContent );
@@ -894,9 +895,10 @@ sal_Bool SVGTextWriter::nextParagraph()
 if( xPropSet-getPropertyValue( NumberingLevel ) = 
nListLevel )
 {
 mbIsNewListItem = sal_True;
+#if OSL_DEBUG_LEVEL  0
 sInfo = NumberingLevel:  + OUString::valueOf( 
(sal_Int32)nListLevel );
 mrExport.AddAttribute( XML_NAMESPACE_NONE, 
style, sInfo );
-
+#endif
 Reference XIndexReplace  xNumRules;
 if( xPropSetInfo-hasPropertyByName( 
NumberingRules ) )
 {
@@ -913,11 +915,13 @@ sal_Bool SVGTextWriter::nextParagraph()
 OSL_FAIL( numbered paragraph without 
number info );
 bIsNumbered = sal_False;
 }
+#if OSL_DEBUG_LEVEL  0
 if( bIsNumbered )
 {
 sInfo = true;
 mrExport.AddAttribute( 
XML_NAMESPACE_NONE, is-numbered, sInfo );
 }
+#endif
 }
 mbIsNewListItem = bIsNumbered;
 
@@ -958,8 +962,10 @@ sal_Bool SVGTextWriter::nextParagraph()
 cBullet = 0xF000 + 149;
 }
 mcBulletChar = cBullet;
+#if OSL_DEBUG_LEVEL  0
 sInfo = OUString::valueOf( 
(sal_Int32) cBullet );
 mrExport.AddAttribute( 
XML_NAMESPACE_NONE, bullet-char, sInfo );
+#endif
 }
 
 }
@@ -976,20 +982,26 @@ sal_Bool SVGTextWriter::nextParagraph()
 {
 mrTextPortionEnumeration.set( xEnumeration );
 }
+#if OSL_DEBUG_LEVEL  0
 sInfo = Paragraph;
+#endif
 }
 else if( xServiceInfo-supportsService( 
com.sun.star.text.Table ) )
 {
 OSL_FAIL( SVGTextWriter::nextParagraph: text tables are 
not handled. );
+#if OSL_DEBUG_LEVEL  0
 sInfo = Table;
+#endif
 }
 else
 {
 OSL_FAIL( SVGTextWriter::nextParagraph: Unknown text 
content. );
 return sal_False;
 }
+#if OSL_DEBUG_LEVEL  0
 mrExport.AddAttribute( XML_NAMESPACE_NONE, class, sInfo );
 SvXMLElementExport aParaElem( mrExport, XML_NAMESPACE_NONE, 
desc, mbIWS, mbIWS );
+#endif
 }
 else
 {
@@ -1006,126 +1018,7 @@ sal_Bool SVGTextWriter::nextParagraph()
 return sal_True;
 }
 }
-#else
-if( mrParagraphEnumeration.is()  
mrParagraphEnumeration-hasMoreElements() )
-{
-Reference  XTextContent   xTextContent( 
mrParagraphEnumeration-nextElement(), UNO_QUERY_THROW );
-if( xTextContent.is() )
-{
-Reference XServiceInfo  xServiceInfo( xTextContent, 
UNO_QUERY_THROW );
-if( xServiceInfo.is() )
-{
-if( xServiceInfo-supportsService( 
com.sun.star.text.Paragraph ) )
-{
-mrCurrentTextParagraph.set( xTextContent );
-Reference XPropertySet  

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

[Caolán McNamara]

 extras/source/glade/libreoffice-catalog.xml.in |   12 
 1 file changed, 12 insertions(+)

New commits:
commit 0ef769f4ad4ee47eb6c5f316c4f9891ae724c975
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Apr 30 12:54:18 2013 +0100

yet more custom widget stubs

Change-Id: Icba78537cd1f2bf2c83564bb65a5167a20a76e90

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index dce1a5e..ca81047 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -63,6 +63,12 @@
 glade-widget-class title=Number Preview name=cuilo-SvxNumberPreview
 generic-name=Number Preview Window 
parent=GtkDrawingArea
 icon-name=widget-gtk-drawingarea/
+glade-widget-class title=Background Preview 
name=cuilo-BackgroundPreview
+generic-name=Background Preview Window 
parent=GtkDrawingArea
+icon-name=widget-gtk-drawingarea/
+glade-widget-class title=Rectangle Preview name=svxlo-SvxXRectPreview
+generic-name=Rectangle Preview Window 
parent=GtkDrawingArea
+icon-name=widget-gtk-drawingarea/
 glade-widget-class title=Frame Selector name=svxlo-SvxFrameSelector
 generic-name=Frame Border Preview Window 
parent=GtkDrawingArea
 icon-name=widget-gtk-drawingarea/
@@ -108,9 +114,15 @@
 glade-widget-class title=Print Preview name=vcllo-PrintPreviewWindow
 generic-name=Print Preview parent=GtkDrawingArea
 icon-name=widget-gtk-drawingarea/
+glade-widget-class title=Rectangle Control name=svxlo-SvxRectCtl
+generic-name=Rectangle Control 
parent=GtkDrawingArea
+icon-name=widget-gtk-drawingarea/
 glade-widget-class title=Text Direction ListBox 
name=svxlo-FrameDirectionListBox
 generic-name=FrameDirectionListBox 
parent=GtkComboBox
 icon-name=widget-gtk-combobox/
+glade-widget-class title=Gradiant ListBox name=svxlo-GradientLB
+generic-name=GradiantListBox parent=GtkComboBox
+icon-name=widget-gtk-combobox/
 glade-widget-class title=Category ComboBox name=swuilo-CategoryBox
 generic-name=CategoryComboBox parent=GtkComboBox
 icon-name=widget-gtk-combobox/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: LibreOffice is one or several applications?

[Caolán McNamara]

On Mon, 2013-04-29 at 10:31 +0200, Jesús Corrius wrote:

 Identifying the different components of LibreOffice as different
 applications has its advantages.

For GNOME3 I added an ApplicationID
as
http://cgit.freedesktop.org/libreoffice/core/commit/?id=2aee1633048bcb732a5c1917580d305afa54e5ef
and
http://cgit.freedesktop.org/libreoffice/core/commit/?id=e9daae2025279d04155ddeb794bb35952e627ed7
in order to make GNOME3 consider all the writers different toplevel
window groups to all the calcs etc. The windows code to do something
with that however is just an empty stub.

C.


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

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

[Jan Holesovsky]

 solenv/gbuild/CppunitTest.mk |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit b308d0b061b24688cf1312af817a2af1c21e2bd8
Author: Jan Holesovsky ke...@suse.cz
Date:   Tue Apr 30 14:11:44 2013 +0200

More helpful message how to re-run a unit test that failed.

Change-Id: Ibd85ecd6a24611313a24b79b3e4b122eccd02a81

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index a4478ee..cb12753 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -30,7 +30,10 @@
 # CppunitTest class
 
 
-UNIT_FAILED_MSG := echo; echo Error: a unit test failed, please do one of:; 
echo; echo export DEBUGCPPUNIT=TRUE\# for exception catching; 
echo export GDBCPPUNITTRACE=\gdb --args\ \# for interactive debugging; echo 
export VALGRIND=memcheck\# for memory checking ; echo and retry.
+# 1st parameter gives the name of the unit test that failed
+define gb_UNIT_FAILED_MSG
+echo; echo Error: a unit test failed, please do one of:; echo; echo export 
DEBUGCPPUNIT=TRUE\# for exception catching; echo export 
GDBCPPUNITTRACE=\gdb --args\ \# for interactive debugging; echo export 
VALGRIND=memcheck\# for memory checking ; echo ; echo and retry 
using: make CppunitTest_$(1)
+endef
 
 ifeq ($(strip $(DEBUGCPPUNIT)),TRUE)
 gb_CppunitTest_GDBTRACE := gdb -nx -ex add-auto-load-safe-path $(OUTDIR)/lib 
--command=$(SOLARENV)/bin/gdbtrycatchtrace-stdout -return-child-result --args
@@ -97,7 +100,7 @@ $(call gb_CppunitTest_get_target,%) :| 
$(gb_CppunitTest_CPPTESTDEPS)
$(call gb_CppunitTest__make_args) \
$(if $(gb_CppunitTest__interactive),, \
 $@.log 21 \
-   || (RET=$$?  cat $@.log  $(UNIT_FAILED_MSG) \
+   || (RET=$$?  cat $@.log  $(call 
gb_UNIT_FAILED_MSG,$*) \
$(if $(value gb_CppunitTest_postprocess), \
 $(call 
gb_CppunitTest_postprocess,$(gb_CppunitTest_CPPTESTCOMMAND),$@.core,$$RET)) \
 false
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

 android/experimental/DocumentLoader/native-code.cxx  |2 --
 android/experimental/LibreOffice4Android/native-code.cxx |2 --
 android/experimental/desktop/native-code.cxx |2 --
 sd/source/ui/remotecontrol/Listener.cxx  |3 +--
 sd/source/ui/remotecontrol/Transmitter.cxx   |4 ++--
 5 files changed, 3 insertions(+), 10 deletions(-)

New commits:
commit abacc389db8c7e2bde00cace7292d6259e4c8e6a
Author: Michael Meeks michael.me...@suse.com
Date:   Tue Apr 30 13:19:25 2013 +0100

android: remove lotus word pro filter - bit optimistic.

Change-Id: I08bbec95db2ae9bc7226cd5ca1cc7b81c235a26f

diff --git a/android/experimental/DocumentLoader/native-code.cxx 
b/android/experimental/DocumentLoader/native-code.cxx
index 985a0c0..3961e00 100644
--- a/android/experimental/DocumentLoader/native-code.cxx
+++ b/android/experimental/DocumentLoader/native-code.cxx
@@ -26,7 +26,6 @@ extern C
 extern void * hyphen_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * lng_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * lnth_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * lotuswordpro_component_getFactory( const char * pImplName, 
void * pServiceManager, void * pRegistryKey );
 extern void * oox_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * protocolhandler_component_getFactory( const char * 
pImplName, void * pServiceManager, void * pRegistryKey );
 extern void * sb_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
@@ -74,7 +73,6 @@ lo_get_libmap(void)
 { libhyphenlo.a, hyphen_component_getFactory },
 { liblnglo.a, lng_component_getFactory },
 { liblnthlo.a, lnth_component_getFactory },
-{ liblwpftlo.a, lotuswordpro_component_getFactory },
 { libooxlo.a, oox_component_getFactory },
 { libprotocolhandlerlo.a, protocolhandler_component_getFactory },
 { libscdlo.a, scd_component_getFactory },
diff --git a/android/experimental/LibreOffice4Android/native-code.cxx 
b/android/experimental/LibreOffice4Android/native-code.cxx
index 530e6ee..aebe61b 100644
--- a/android/experimental/LibreOffice4Android/native-code.cxx
+++ b/android/experimental/LibreOffice4Android/native-code.cxx
@@ -34,7 +34,6 @@ extern C
 extern void * hyphen_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * lng_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * lnth_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * lotuswordpro_component_getFactory( const char * pImplName, 
void * pServiceManager, void * pRegistryKey );
 extern void * oox_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * protocolhandler_component_getFactory( const char * 
pImplName, void * pServiceManager, void * pRegistryKey );
 extern void * sb_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
@@ -101,7 +100,6 @@ lo_get_libmap(void)
 { libhyphenlo.a, hyphen_component_getFactory },
 { liblnglo.a, lng_component_getFactory },
 { liblnthlo.a, lnth_component_getFactory },
-{ liblwpftlo.a, lotuswordpro_component_getFactory },
 { libooxlo.a, oox_component_getFactory },
 { libprotocolhandlerlo.a, protocolhandler_component_getFactory },
 { libscdlo.a, scd_component_getFactory },
diff --git a/android/experimental/desktop/native-code.cxx 
b/android/experimental/desktop/native-code.cxx
index d75f426..b4b71b0 100644
--- a/android/experimental/desktop/native-code.cxx
+++ b/android/experimental/desktop/native-code.cxx
@@ -35,7 +35,6 @@ extern C
 extern void * hyphen_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * lng_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * lnth_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * lotuswordpro_component_getFactory( const char * pImplName, 
void * pServiceManager, void * pRegistryKey );
 extern void * protocolhandler_component_getFactory( const char * 
pImplName, void * pServiceManager, void * pRegistryKey );
 extern void * oox_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * sb_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
@@ -106,7 +105,6 @@ lo_get_libmap(void)
 { 

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

[Tor Lillqvist]

 include/sfx2/tbxctrl.hxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit ade26b5c7bd2a88be5147feace1969cc01ae3ed4
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Tue Apr 30 15:26:07 2013 +0300

MSVC: member of dll interface class may not be declared with dll interface

Change-Id: I751832d8725354cebd892738fa80fd7bc5e43925

diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx
index e50527f..b67ed11 100644
--- a/include/sfx2/tbxctrl.hxx
+++ b/include/sfx2/tbxctrl.hxx
@@ -162,7 +162,7 @@ public:
 
 #define SFX_DECL_TOOLBOX_CONTROL() \
 static SfxToolBoxControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 
nId, ToolBox rTbx ); \
-static void SFX2_DLLPUBLIC RegisterControl(sal_uInt16 nSlotId = 0, 
SfxModule *pMod=NULL)
+static void RegisterControl(sal_uInt16 nSlotId = 0, SfxModule 
*pMod=NULL)
 
 /*  For special ToolBox controls, such as a font selection box or toolbox
 tear-off floating windows, an appropriate Item-Subclass of SfxTooBoxControl
@@ -360,7 +360,11 @@ module initialization has to call RegisterControl().
 class SfxRecentFilesToolBoxControl : public SfxToolBoxControl
 {
 public:
-SFX_DECL_TOOLBOX_CONTROL();
+// We don't use SFX_DECL_TOOLBOX_CONTROL() here as we need to have this
+// RegisterControl() marked as SFX2_DLLPUBLIC
+static SfxToolBoxControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, 
ToolBox rTbx );
+static void SFX2_DLLPUBLIC RegisterControl(sal_uInt16 nSlotId = 0, 
SfxModule *pMod=NULL);
+
 SfxRecentFilesToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox 
rBox );
 virtual ~SfxRecentFilesToolBoxControl();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] new upstream release liblangtag-0.5.1

[Eike Rathke (via Code Review)]

Hello LibreOffice gerrit bot,

I'd like you to reexamine a change.  Please visit

https://gerrit.libreoffice.org/3676

to look at the new patch set (#2).

Change subject: new upstream release liblangtag-0.5.1
..

new upstream release liblangtag-0.5.1

Change-Id: I4b71bbd3ff457d7b4fb2a409e8d34d8e4904acb3
---
M download.lst
M liblangtag/ExternalProject_langtag.mk
M liblangtag/UnpackedTarball_langtag.mk
D liblangtag/ar-lib
D liblangtag/liblangtag-0.4.0-ar-lib.patch
D liblangtag/liblangtag-0.4.0-configure-atomic-cflag-pollution.patch
D liblangtag/liblangtag-0.4.0-cross.patch
D liblangtag/liblangtag-0.4.0-mac.patch
D liblangtag/liblangtag-0.4.0-msvcprojects.patch
D liblangtag/liblangtag-0.4.0-ppc.patch
D liblangtag/liblangtag-0.4.0-vsnprintf.patch
D liblangtag/liblangtag-0.4.0-windows.patch
D liblangtag/liblangtag-0.4.0-windows2.patch
D liblangtag/liblangtag-0.4.0-xmlDocCopyNode.patch
R liblangtag/liblangtag-0.5.1-mingw.patch
A liblangtag/liblangtag-0.5.1-msvc-snprintf.patch
A liblangtag/liblangtag-0.5.1-msvc-ssize_t.patch
A liblangtag/liblangtag-0.5.1-msvc-strtoull.patch
R liblangtag/liblangtag-0.5.1-msvc-warning.patch
R liblangtag/liblangtag-0.5.1-reg2xml-encoding-problem.patch
A liblangtag/liblangtag-0.5.1-scope-declaration.patch
A liblangtag/liblangtag-0.5.1-vsnprintf.patch
22 files changed, 95 insertions(+), 2,020 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/76/3676/2
-- 
To view, visit https://gerrit.libreoffice.org/3676
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I4b71bbd3ff457d7b4fb2a409e8d34d8e4904acb3
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Eike Rathke er...@redhat.com
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org

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

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4.0.3.2'

[Petr Mladek]

Tag 'libreoffice-4.0.3.2' created by Petr Mladek pmla...@suse.cz at 
2013-04-30 13:55 -0700

Tag libreoffice-4.0.3.2
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJRf79XAAoJEPQ0oe+v7q6jIkIP/05M5+FDeuYnPr4+4gSBKKD+
ltBApnkVL9tx+Cvur5HAeD2IWmns2aTrnhbLUq6ZBbxgfkor/RdnzGSqdGCR+9Mq
O7a6hPASGQ6rVQj6LK/FnWeSTL341p+P82JpyCqxJmX+dEnz6h8kD2X0YLHAHB7t
izBUI8wEMKLxTKfM0rLUC+Hh1Kb0DJ3+nhWlk+ss9tXaf1mD26Z6XsuToXpN+Vux
f7ql7VyMcc+bBq/EBo8N9i3zzwvC0Jzsgfn7gmLQaFVRAEwO74XVbRHekiyLMYeA
G0RF3MIjmGff/sqYhhvEmnbNPZg3KcUeBtpnOM3hNLnXP4tcZllJC/S05ZRjc4P/
KBjIGV1lorusapvEJ8io/nT7wbsxkqCAva/hVc1OcOHamU6RZqSqmI9pgMeKlKC0
veT/VC6xHzYIdANSlTBb+jHmVq0SX92H5kl+gnndDFhvFafH1soKZhJ1Ce8tatp2
p+bPweu+759kr1JJB1bOSfpLnWFAjgFvzgcbJw9Ep49e9xooH56fTm7BVbNP46kN
ljSGgxOPbAL+knWum10i3K70UZFhR80YjWZWUZ+pAY6wK1Z6tJnaZwYzbPKPaRyN
3gVPcAGD2v7vzerCwfyCuVQW3jMIVXHr9Sf1PM/hNrz/SgtC9sSa5VcG+ET9UfjD
nG83Pp41UAZ5cA2bhXzk
=6HVB
-END PGP SIGNATURE-

Changes since sdremote-1.0.2-7:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.0.3.2'

[Petr Mladek]

Tag 'libreoffice-4.0.3.2' created by Petr Mladek pmla...@suse.cz at 
2013-04-30 13:55 -0700

Tag libreoffice-4.0.3.2
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJRf79XAAoJEPQ0oe+v7q6jTYYP/2BpjNhkYXs/TH/nVNzw7XSQ
HSrt5W+RbPkT2wyzo43D4lUDB71xRFl7iC2Ti/KU8cpi6TOfK6DVFL2g1c6YevhR
t7Mlqy/nQicEpeAqzg33IwZ8pZB5pv9ZUK6wWKkhJlpRq3DkOC7zyETlDa1ny4OR
1TswuBFwuhdBsJ9L8kEzTIEbXJAY1rGG5kpn8G4/WbiAx4RI0+UdeF7GnO7eY8qX
it/rMZwpCa7jstY0CElo8iqiA4vomd0I7+wxkpUo45bLTwmqF74wfBKbY+gyK61y
gKRFgQeHxvffaheXKi1gaoTweQGYpXZ10yE2i9zJons57R71P3VCE3oThXnsPR7t
4Czrpjg3od+3UUHTkKH0aVTep9do5RqvDBKGGRnnimB4ptt2mX3om7242FD2Ijmm
JROf/vK/AfD5YZZNvoj4GpFHpRVnxcl28s5q8cbnvQQh7y0EQvTZUJ0J8xnZWfN3
j5xvSP7CvOgbPNVMizBTcGG6CgKm4k8GIaqUbOyq7UW5XARvBfolPL9cIxj51tWA
CL42jV53biIOeEiDAacei3eb5gbQ8TwdRKvP3f99LHr4gh8PsxaSq7eVB4c1B5W4
OXhqCjkAxp7IZrA3y4ayiOHGjlxQ0wi7sk4H4ioOHSNeDH/DDYfD48jn6LDBXT2e
O+LMSD3mZeXqlORjrtgz
=IE1f
-END PGP SIGNATURE-

Changes since sdremote-1.0.2-5:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.0.3.2'

[Petr Mladek]

Tag 'libreoffice-4.0.3.2' created by Petr Mladek pmla...@suse.cz at 
2013-04-30 13:55 -0700

Tag libreoffice-4.0.3.2
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJRf79YAAoJEPQ0oe+v7q6j3yIP/ivQ7nYn6BQDNh6zbQxztN8s
tkoT3X26AJCGpveQOf6bXnbSAgSkp3CSPpdm7gn1Pr+lJFNs74TZ4V2FpBJXqHR7
ZDwuYpm3ldvQ+p4QI0pWzHIaAAqvikUbVCNG/rn5zF52wcLRx2/+ZsP+swheC79c
kQei6gOwkrlc/iGe5izO9NOmSX7YUGSlLwKEY7VpHxwbX3egT/KWhHVCX81vZfT1
TlWvf+pKJU1puFgOnDiinl8Eys/kcWOYYFHIjb2I5JcCKfyie+gsxdhxEvdD4h8P
qReySgEZCGpS8hkUv7cj2eqxaFJKfnfomWDU88JhK3YZhghP3OUb0q0+e8aMiCMX
n/AvLy3k8IpzC5PAHhPScOgcNB06g95O4m+dDCx0UBkkGEZARu+UZ4wXJ3SHWSsW
VNVRj7Ff3qp0FtG4lvicwl9vP9rIo2KzP2ocBzFRmT8J2TeWrJpdjx1h0q2KwySB
i5XfhxCvdLwGGo3zWBSepqArJTq/lQjDJYZrqwxplfBbHGPlYoqYubhTKK0ly+El
NcnsBbtfH1uW8sI/zRqkiS1SqTKW3bdfS5QEZCQorwTphn8j82rJwIStXv4gHgcq
71351SJvahDC8e2QYJNQmuX9qt3z4Nz2jpABjPXfO12jkUVWpZpAlDbbPDeOWf/C
/exbMBbdVMsx160FCZWI
=vfzv
-END PGP SIGNATURE-

Changes since sdremote-1.0.2-9:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Petr Mladek]

Tag 'libreoffice-4.0.3.2' created by Petr Mladek pmla...@suse.cz at 
2013-04-30 13:55 -0700

Tag libreoffice-4.0.3.2
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJRf79YAAoJEPQ0oe+v7q6jlvgP/313LKeNEL37j2pviBj+kDZJ
b+oMVAGdHwcAKfKf73E82UL/rfwte6AwpnK6b3ebjg7bDyfJ77OV40b9qISIr5Z/
lvqss2S5VUe++iNXaMRiJFkFegigLWWqoe1J415yEzeOtYLmDWjQfuJJ0medD7pb
aKMbevEfGrO0o8Pxzd9fswvyLhBK+zxjvb63l3Zjn7CFzFANmT9JsgKkggXsqYmP
zkJoBLY4iR34rAvHg0eJlyKRgGAMwFm0SQ9UYyN+xBhkMszdlzlBg3Yrbvh18xQP
5a8zGEF0z/JWVBUIRfL5GqMPRmbyjAk9fFk2ph4iXywcn0cLBaL3MBgO0xPoHclf
qPvHM07x0q/iW/dItefZwB0nH2jFyTlCgfKiBnhfwIYZ9da88rvDvj3JTs0wUVKF
+6kLf/vv4n1vpk1ttah2GJGZKE6KOnug67kfT8qbsrE7hwhZH/BBS4boLDLfGL1Q
B6NH+kdD6O1R6BCOKtCSA4hhw7O4TIh4tgDVeJCtXF7ExRzxu7SJ7/XRVJ3M6M0H
A1cImyBo6vf2esl21pUxapiS3KQfOfwnrrjCwlWhFjpBZOeehe+ZtrzHFfRqbEyO
7tLQXnx43uTr4mIk5QToXiQ0ePndQcaihENUENpNLbT3VYRmXU140iGrX9VRpI91
upEZcbSF3C4miPnh1+MP
=NCNY
-END PGP SIGNATURE-

Changes since sdremote-1.0.0-486:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 cppuhelper/source/typemanager.cxx |9 +
 1 file changed, 9 insertions(+)

New commits:
commit 05713a171fa8395369bb32b23e24bd97bb5ad58f
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Apr 30 15:04:20 2013 +0200

Explicit copy ctor avoiding copying singular iterators

Change-Id: I0727d4676166e63992e78ec3ac7e68c217fa794b

diff --git a/cppuhelper/source/typemanager.cxx 
b/cppuhelper/source/typemanager.cxx
index 8044d82..c4f4cbc 100644
--- a/cppuhelper/source/typemanager.cxx
+++ b/cppuhelper/source/typemanager.cxx
@@ -1715,6 +1715,15 @@ private:
 constantGroupIndex(constantGroup-getMembers().begin())
 { assert(theConstantGroup.is()); }
 
+Position(Position const  other):
+prefix(other.prefix), cursor(other.cursor),
+constantGroup(other.constantGroup)
+{
+if (constantGroup.is()) {
+constantGroupIndex = other.constantGroupIndex;
+}
+}
+
 rtl::OUString prefix;
 rtl::Reference unoidl::MapCursor  cursor;
 rtl::Reference unoidl::ConstantGroupEntity  constantGroup;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Power]

 tools/source/generic/fract.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 38d7278e38b8c6d6e332814b5c626ab182d41d31
Author: Noel Power noel.po...@suse.com
Date:   Tue Apr 30 14:07:51 2013 +0100

fix for fdo#64078

Change-Id: Ib8c70b0074485ccd8bf6095c070610fe90e22d4a

diff --git a/tools/source/generic/fract.cxx b/tools/source/generic/fract.cxx
index 4f5ee96..c99db66 100644
--- a/tools/source/generic/fract.cxx
+++ b/tools/source/generic/fract.cxx
@@ -132,7 +132,7 @@ Fraction::Fraction( double dVal )
 return;
 }
 
-while ( abs( (long)dVal )  nMAX  nDen  nMAX )
+while ( labs( (long)dVal )  nMAX  nDen  nMAX )
 {
 dVal *= 10;
 nDen *= 10;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] new upstream release liblangtag-0.5.1

[Eike Rathke (via Code Review)]

Hello LibreOffice gerrit bot,

I'd like you to reexamine a change.  Please visit

https://gerrit.libreoffice.org/3676

to look at the new patch set (#3).

Change subject: new upstream release liblangtag-0.5.1
..

new upstream release liblangtag-0.5.1

Change-Id: I4b71bbd3ff457d7b4fb2a409e8d34d8e4904acb3
---
M download.lst
M liblangtag/ExternalProject_langtag.mk
M liblangtag/UnpackedTarball_langtag.mk
D liblangtag/ar-lib
D liblangtag/liblangtag-0.4.0-ar-lib.patch
D liblangtag/liblangtag-0.4.0-configure-atomic-cflag-pollution.patch
D liblangtag/liblangtag-0.4.0-cross.patch
D liblangtag/liblangtag-0.4.0-mac.patch
D liblangtag/liblangtag-0.4.0-msvcprojects.patch
D liblangtag/liblangtag-0.4.0-ppc.patch
D liblangtag/liblangtag-0.4.0-vsnprintf.patch
D liblangtag/liblangtag-0.4.0-windows.patch
D liblangtag/liblangtag-0.4.0-windows2.patch
D liblangtag/liblangtag-0.4.0-xmlDocCopyNode.patch
R liblangtag/liblangtag-0.5.1-mingw.patch
A liblangtag/liblangtag-0.5.1-msvc-snprintf.patch
A liblangtag/liblangtag-0.5.1-msvc-ssize_t.patch
A liblangtag/liblangtag-0.5.1-msvc-strtoull.patch
R liblangtag/liblangtag-0.5.1-msvc-warning.patch
A liblangtag/liblangtag-0.5.1-redefinition-of-typedef.patch
R liblangtag/liblangtag-0.5.1-reg2xml-encoding-problem.patch
A liblangtag/liblangtag-0.5.1-scope-declaration.patch
A liblangtag/liblangtag-0.5.1-vsnprintf.patch
23 files changed, 127 insertions(+), 2,020 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/76/3676/3
-- 
To view, visit https://gerrit.libreoffice.org/3676
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I4b71bbd3ff457d7b4fb2a409e8d34d8e4904acb3
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Eike Rathke er...@redhat.com
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org

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

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

[Noel Power]

 tools/source/generic/fract.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1b14676b5f95dd51d6266a6ab7bd713a5ddcff2f
Author: Noel Power noel.po...@suse.com
Date:   Tue Apr 30 14:18:33 2013 +0100

redo fix for fdo#64078

use std::abs instead of labs

Change-Id: Icb09fb1715d4795c718773a37e66947d67019bb7

diff --git a/tools/source/generic/fract.cxx b/tools/source/generic/fract.cxx
index c99db66..cad06a7 100644
--- a/tools/source/generic/fract.cxx
+++ b/tools/source/generic/fract.cxx
@@ -132,7 +132,7 @@ Fraction::Fraction( double dVal )
 return;
 }
 
-while ( labs( (long)dVal )  nMAX  nDen  nMAX )
+while ( std::abs( (long)dVal )  nMAX  nDen  nMAX )
 {
 dVal *= 10;
 nDen *= 10;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 include/vcl/builder.hxx   |7 +++
 vcl/source/window/builder.cxx |   21 ++---
 2 files changed, 21 insertions(+), 7 deletions(-)

New commits:
commit 3a3b64a964f92a63d15407fc7769311a9ecbfb48
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Apr 30 14:55:14 2013 +0100

retain references to loaded modules for builders lifetime

Change-Id: Iab8b53dc50d69ba781978e1e7fd9b9c5a19c6d59

diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 5de792a..ff72766 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -11,6 +11,7 @@
 #define _VCLBUILDER_HXX
 
 #include typeinfo
+#include osl/module.hxx
 #include tools/resmgr.hxx //for poxy ResHookProc typedef
 #include vcl/dllapi.h
 #include vcl/window.hxx
@@ -19,6 +20,7 @@
 #include set
 #include stack
 #include vector
+#include boost/ptr_container/ptr_map.hpp
 
 class ListBox;
 class NumericFormatter;
@@ -34,6 +36,11 @@ public:
 typedef std::mapOString, OString stringmap;
 typedef Window* (*customMakeWidget)(Window *pParent, stringmap rVec);
 private:
+typedef boost::ptr_mapOUString, osl::Module ModuleMap;
+//We store these until the builder is deleted, that way we can use the
+//ui-previewer on custom widgets and guarantee the modules they are from
+//exist for the duration of the dialog
+ModuleMap m_aModuleMap;
 
 struct PackingData
 {
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 0833a35..1cf5b8b 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1203,20 +1203,27 @@ Window *VclBuilder::makeObject(Window *pParent, const 
OString name, const OStri
 if (nDelim != -1)
 {
 #ifndef DISABLE_DYNLOADING
-OUStringBuffer sModule;
+OUStringBuffer sModuleBuf;
 #ifdef SAL_DLLPREFIX
-sModule.append(SAL_DLLPREFIX);
+sModuleBuf.append(SAL_DLLPREFIX);
 #endif
-sModule.append(OStringToOUString(name.copy(0, nDelim), 
RTL_TEXTENCODING_UTF8));
+sModuleBuf.append(OStringToOUString(name.copy(0, nDelim), 
RTL_TEXTENCODING_UTF8));
 #ifdef SAL_DLLEXTENSION
-sModule.append(SAL_DLLEXTENSION);
+sModuleBuf.append(SAL_DLLEXTENSION);
 #endif
 #endif
 OUString sFunction(OStringToOUString(OString(make) + 
name.copy(nDelim+1), RTL_TEXTENCODING_UTF8));
 #ifndef DISABLE_DYNLOADING
-osl::Module aModule;
-aModule.loadRelative(thisModule, sModule.makeStringAndClear());
-customMakeWidget pFunction = 
(customMakeWidget)aModule.getFunctionSymbol(sFunction);
+OUString sModule = sModuleBuf.makeStringAndClear();
+ModuleMap::iterator aI = m_aModuleMap.find(sModule);
+osl::Module* pModule = NULL;
+if (aI == m_aModuleMap.end())
+{
+pModule = new osl::Module;
+pModule-loadRelative(thisModule, sModule);
+aI = m_aModuleMap.insert(sModule, pModule).first;
+}
+customMakeWidget pFunction = 
(customMakeWidget)aI-second-getFunctionSymbol(sFunction);
 #else
 customMakeWidget pFunction = 
(customMakeWidget)osl_getFunctionSymbol((oslModule) RTLD_DEFAULT, 
sFunction.pData);
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source

[Kohei Yoshida]

 sc/source/core/data/formulacell.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8ab8c0b0f5389d98abd40919fe784af6a2d2ad04
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Tue Apr 30 10:01:43 2013 -0400

Reset dirty.

Change-Id: I20a8b56a9241081192e32b3d3a0de9295277e38a

diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 7158b69..3e85a9e 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3137,6 +3137,7 @@ bool ScFormulaCell::InterpretFormulaGroup()
 aInterpreter.Interpret();
 
 pDest-aResult.SetToken(aInterpreter.GetResultToken().get());
+pDest-ResetDirty();
 }
 
 return true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source

[Kohei Yoshida]

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

New commits:
commit e0d295eacf3e7c5a19f3c7a2d764bcafe74e6d8d
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Tue Apr 30 10:19:58 2013 -0400

Typo.

Change-Id: I46eba8fff2a1b18d267b0fce0bb1a2abcce779a8

diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 34be0d1..7abc279 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -2149,7 +2149,7 @@ const double* ScTable::FetchDoubleArray(
 if (!ValidCol(nCol) || !ValidRow(nRow1) || !ValidRow(nRow2))
 return NULL;
 
-return aCol[nCol].FetchDoubleArray(rCxt, nRow1, nRow1);
+return aCol[nCol].FetchDoubleArray(rCxt, nRow1, nRow2);
 }
 
 ScRefCellValue ScTable::GetRefCellValue( SCCOL nCol, SCROW nRow )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 solenv/bin/soirpm.sh |   24 
 1 file changed, 24 deletions(-)

New commits:
commit 6ab8f15653af431fcacffb3c9227f90aa04456f7
Author: Tor Lillqvist t...@iki.fi
Date:   Tue Apr 30 17:21:54 2013 +0300

Remove weird unused script

Change-Id: I97979428ba9f31f493b043e485b77b2a379f21c5

diff --git a/solenv/bin/soirpm.sh b/solenv/bin/soirpm.sh
deleted file mode 100755
index 9d99e8a..000
--- a/solenv/bin/soirpm.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the License); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-LIBRPMBUILD=$(find ${COMPATH} -name 'librpmbuild-4.1*' -print)
-# echo $(dirname $LIBRPMBUILD)
-LD_LIBRARY_PATH=$(dirname ${LIBRPMBUILD}) ${BUILD_TOOLS?}/rpm $@
-# LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${COMPATH?}/lib \
-# ${BUILD_TOOLS?}/rpm $@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

integrating wizards

[adrivero]

I implemented a wizard to LibreOffice Writer, (using service mode for
LibreOffice) now I wondered how to integrate it with the application (the
application make writer there is a menu item to launch my assistant), thanks
in advance



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

[PATCH] new upstream release liblangtag-0.5.1

[Eike Rathke (via Code Review)]

Hello LibreOffice gerrit bot,

I'd like you to reexamine a change.  Please visit

https://gerrit.libreoffice.org/3676

to look at the new patch set (#4).

Change subject: new upstream release liblangtag-0.5.1
..

new upstream release liblangtag-0.5.1

Change-Id: I4b71bbd3ff457d7b4fb2a409e8d34d8e4904acb3
---
M download.lst
M liblangtag/ExternalProject_langtag.mk
M liblangtag/UnpackedTarball_langtag.mk
D liblangtag/ar-lib
D liblangtag/liblangtag-0.4.0-ar-lib.patch
D liblangtag/liblangtag-0.4.0-configure-atomic-cflag-pollution.patch
D liblangtag/liblangtag-0.4.0-cross.patch
D liblangtag/liblangtag-0.4.0-mac.patch
D liblangtag/liblangtag-0.4.0-msvcprojects.patch
D liblangtag/liblangtag-0.4.0-ppc.patch
D liblangtag/liblangtag-0.4.0-vsnprintf.patch
D liblangtag/liblangtag-0.4.0-windows.patch
D liblangtag/liblangtag-0.4.0-windows2.patch
D liblangtag/liblangtag-0.4.0-xmlDocCopyNode.patch
R liblangtag/liblangtag-0.5.1-mingw.patch
A liblangtag/liblangtag-0.5.1-msvc-snprintf.patch
A liblangtag/liblangtag-0.5.1-msvc-ssize_t.patch
A liblangtag/liblangtag-0.5.1-msvc-strtoull.patch
R liblangtag/liblangtag-0.5.1-msvc-warning.patch
A liblangtag/liblangtag-0.5.1-redefinition-of-typedef.patch
R liblangtag/liblangtag-0.5.1-reg2xml-encoding-problem.patch
A liblangtag/liblangtag-0.5.1-scope-declaration.patch
A liblangtag/liblangtag-0.5.1-vsnprintf.patch
23 files changed, 121 insertions(+), 2,020 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/76/3676/4
-- 
To view, visit https://gerrit.libreoffice.org/3676
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I4b71bbd3ff457d7b4fb2a409e8d34d8e4904acb3
Gerrit-PatchSet: 4
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Eike Rathke er...@redhat.com
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org

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

[PATCH] make parent style for 'frame contents' be 'standard' rather ...

[via Code Review]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3697

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/97/3697/1

make parent style for 'frame contents' be 'standard' rather than 'text'

The actual reason for this change is a .docx document, which has a textframe
and a modified 'text' style. The textframe in MSO has 'normal' style
(which is like our 'standard') and so the style is not written to the docx.
LO however uses 'frame contents' for the textframe, and since it was
based on 'text', it used the modified style, unlike in MSO.

But even on its own, this change seems to make sense. It's similar
to 4014d40c96b9d70796a154f0ac48cf5b685cf187, and I see no particular
reason why contents of textframes should be the same style like the main
text of the document, while footnotes, footers, headers, tables, etc.
are different.

Change-Id: Ibe7bfd6a2820cff5cf29c669fd60b575c63500b0
---
M sw/source/core/doc/poolfmt.cxx
1 file changed, 1 insertion(+), 3 deletions(-)



diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index 245efdb..e15e044 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -2388,12 +2388,10 @@
 case COLL_EXTRA_BITS:
 switch( nId )
 {
-case RES_POOLCOLL_FRAME:
-nRet = RES_POOLCOLL_TEXT;   break;
-
 case RES_POOLCOLL_TABLE_HDLN:
 nRet = RES_POOLCOLL_TABLE;  break;
 
+case RES_POOLCOLL_FRAME:
 case RES_POOLCOLL_TABLE:
 case RES_POOLCOLL_FOOTNOTE:
 case RES_POOLCOLL_ENDNOTE:

-- 
To view, visit https://gerrit.libreoffice.org/3697
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibe7bfd6a2820cff5cf29c669fd60b575c63500b0
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Luboš Luňák l.lu...@suse.cz

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

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

[Armin Le Grand]

 include/svx/svdundo.hxx   |   11 +---
 svl/source/items/style.cxx|   21 ++--
 svx/source/svdraw/svdundo.cxx |   53 ++
 3 files changed, 63 insertions(+), 22 deletions(-)

New commits:
commit 4c8ffa01131f2df2b314218731d83bd776944802
Author: Armin Le Grand a...@apache.org
Date:   Wed Jun 20 08:17:23 2012 +

i#120015# Let SdrUndoAttrObj remember a reference to the used style to 
survive

removal of the style by UI (which creates no undo actions). Re-add the
style when undoing if needed.

Change-Id: I6069a1cb42dfaeb0dd35fdc15687fd307f2b641e

diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx
index 2221164..78d9a9c 100644
--- a/include/svx/svdundo.hxx
+++ b/include/svx/svdundo.hxx
@@ -22,8 +22,9 @@
 
 #include svl/solar.hrc
 #include svl/undo.hxx
+#include svl/style.hxx
 #include tools/gen.hxx
-#include svx/svdtypes.hxx // fuer enum RepeatFuncts
+#include svx/svdtypes.hxx // for enum RepeatFuncts
 #include svx/svdsob.hxx
 #include svx/svxdllapi.h
 
@@ -159,9 +160,8 @@ protected:
 SfxItemSet* pRepeatSet;
 
 // oder besser den StyleSheetNamen merken?
-SfxStyleSheet*  pUndoStyleSheet;
-SfxStyleSheet*  pRedoStyleSheet;
-SfxStyleSheet*  pRepeatStyleSheet;
+rtl::Reference SfxStyleSheetBase  mxUndoStyleSheet;
+rtl::Reference SfxStyleSheetBase  mxRedoStyleSheet;
 boolbStyleSheet;
 boolbHaveToTakeRedoSet;
 
@@ -174,6 +174,9 @@ protected:
 // Wenn sich um ein Gruppenobjekt handelt:
 SdrUndoGroup*   pUndoGroup;
 
+// helper to ensure StyleSheet is in pool (provided by SdrModel from 
SdrObject)
+void ensureStyleSheetInStyleSheetPool(SfxStyleSheetBasePool 
rStyleSheetPool, SfxStyleSheet rSheet);
+
 public:
 SdrUndoAttrObj(SdrObject rNewObj, bool bStyleSheet1 = false, bool 
bSaveText = false);
 virtual ~SdrUndoAttrObj();
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index c2879e7..8c8c193 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -734,14 +734,19 @@ void SfxStyleSheetBasePool::Remove( SfxStyleSheetBase* p )
 // Alle Styles umsetzen, deren Parent dieser hier ist
 ChangeParent( p-GetName(), p-GetParent() );
 
-com::sun::star::uno::Reference com::sun::star::lang::XComponent  
xComp( static_cast ::cppu::OWeakObject* ((*aIter).get()), 
com::sun::star::uno::UNO_QUERY );
-if( xComp.is() ) try
-{
-xComp-dispose();
-}
-catch( com::sun::star::uno::Exception )
-{
-}
+// #120015# Do not dispose, the removed StyleSheet may still be 
used in
+// existing SdrUndoAttrObj incarnations. Rely on refcounting for 
disposal,
+// this works well under normal conditions (checked breaking and 
counting
+// on SfxStyleSheetBase constructors and destructors)
+//
+// com::sun::star::uno::Reference 
com::sun::star::lang::XComponent  xComp( static_cast ::cppu::OWeakObject* 
((*aIter).get()), com::sun::star::uno::UNO_QUERY );
+// if( xComp.is() ) try
+// {
+//  xComp-dispose();
+// }
+// catch( com::sun::star::uno::Exception )
+// {
+// }
 
 aStyles.erase(aIter);
 Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_ERASED, *p ) );
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 284aaca..3bcace5 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -246,16 +246,29 @@ void SdrUndoObj::ImpShowPageOfThisObject()
 }
 }
 
-
+void SdrUndoAttrObj::ensureStyleSheetInStyleSheetPool(SfxStyleSheetBasePool 
rStyleSheetPool, SfxStyleSheet rSheet)
+{
+SfxStyleSheetBase* pThere = rStyleSheetPool.Find(rSheet.GetName(), 
rSheet.GetFamily());
+
+if(!pThere)
+{
+// re-insert remembered style which was removed in the meantime. To do 
this
+// without assertion, do it without parent and set parent after 
insertion
+const UniString aParent(rSheet.GetParent());
+
+rSheet.SetParent(UniString());
+rStyleSheetPool.Insert(rSheet);
+rSheet.SetParent(aParent);
+}
+}
 
 SdrUndoAttrObj::SdrUndoAttrObj(SdrObject rNewObj, bool bStyleSheet1, bool 
bSaveText)
 :   SdrUndoObj(rNewObj),
 pUndoSet(NULL),
 pRedoSet(NULL),
 pRepeatSet(NULL),
-pUndoStyleSheet(NULL),
-pRedoStyleSheet(NULL),
-pRepeatStyleSheet(NULL),
+mxUndoStyleSheet(),
+mxRedoStyleSheet(),
 bHaveToTakeRedoSet(sal_True),
 pTextUndo(NULL),
 
@@ -288,7 +301,7 @@ SdrUndoAttrObj::SdrUndoAttrObj(SdrObject rNewObj, bool 
bStyleSheet1, bool bSave
 

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 87/35f585cdc29938681caa7ed50cb33b7f13fe6f

[Michael Meeks]

 87/35f585cdc29938681caa7ed50cb33b7f13fe6f |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d550c6cc2334198afeb255f142b5e63e6c5291dd
Author: Michael Meeks michael.me...@suse.com
Date:   Tue Apr 30 15:40:53 2013 +0100

Notes added by 'git notes add'

diff --git a/87/35f585cdc29938681caa7ed50cb33b7f13fe6f 
b/87/35f585cdc29938681caa7ed50cb33b7f13fe6f
new file mode 100644
index 000..bd313e0
--- /dev/null
+++ b/87/35f585cdc29938681caa7ed50cb33b7f13fe6f
@@ -0,0 +1 @@
+merged as: 4c8ffa01131f2df2b314218731d83bd776944802
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

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

New commits:
commit 71512d1a9951850521950d8ebf0c931d6f6f0552
Author: Tor Lillqvist t...@iki.fi
Date:   Tue Apr 30 17:34:26 2013 +0300

Restore accidentally removed prefix

Change-Id: I62e9daa35605883ee0949ecdce6b86c07cc42c09

diff --git a/cui/source/uno/services.cxx b/cui/source/uno/services.cxx
index 01c0779..f5aa9cb 100644
--- a/cui/source/uno/services.cxx
+++ b/cui/source/uno/services.cxx
@@ -38,7 +38,7 @@ namespace
 };
 }
 
-extern C SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( char 
const * implName, void * serviceManager, void * registryKey)
+extern C SAL_DLLPUBLIC_EXPORT void * SAL_CALL cui_component_getFactory( char 
const * implName, void * serviceManager, void * registryKey)
 {
 return cppu::component_getFactoryHelper(implName, serviceManager, 
registryKey, entries);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Markus Mohrhard]

 oox/source/export/drawingml.cxx |   20 ++--
 1 file changed, 14 insertions(+), 6 deletions(-)

New commits:
commit 99b7b41992f02ce4ed85475b448ab61f3b596f11
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Tue Apr 30 16:30:20 2013 +0200

export a:noFill to prevent wrong default

Except for the data label issue my test file looks good now. There are a
few more small issues that I should take care of but it looks nice
already.

Change-Id: I4a6097baefe26088d0246f6335246a211ba143eb

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index ead3ed2..cad8ea1 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -319,19 +319,20 @@ void DrawingML::WriteOutline( Reference XPropertySet  
rXPropSet )
 
 GET( aLineStyle, LineStyle );
 
-if( aLineStyle == drawing::LineStyle_NONE )
-return;
-
 sal_uInt32 nLineWidth = 0;
 sal_uInt32 nColor = 0;
 sal_Bool bColorSet = sal_False;
 const char* cap = NULL;
 drawing::LineDash aLineDash;
 sal_Bool bDashSet = sal_False;
+bool bNoFill = false;
 
 GET( nLineWidth, LineWidth );
 
 switch( aLineStyle ) {
+case drawing::LineStyle_NONE:
+bNoFill = true;
+break;
 case drawing::LineStyle_DASH:
 if( GETA( LineDash ) ) {
 aLineDash = *(drawing::LineDash*) mAny.getValue();
@@ -375,7 +376,7 @@ void DrawingML::WriteOutline( Reference XPropertySet  
rXPropSet )
 mpFS-endElementNS( XML_a, XML_custDash );
 }
 
-if( nLineWidth  1  GETA( LineJoint ) ) {
+if( !bNoFill  nLineWidth  1  GETA( LineJoint ) ) {
 LineJoint eLineJoint;
 
 mAny = eLineJoint;
@@ -395,8 +396,15 @@ void DrawingML::WriteOutline( Reference XPropertySet  
rXPropSet )
 }
 }
 
-WriteLineArrow( rXPropSet, sal_True );
-WriteLineArrow( rXPropSet, sal_False );
+if( !bNoFill )
+{
+WriteLineArrow( rXPropSet, sal_True );
+WriteLineArrow( rXPropSet, sal_False );
+}
+else
+{
+mpFS-singleElementNS( XML_a, XML_noFill, FSEND );
+}
 
 mpFS-endElementNS( XML_a, XML_ln );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[ANNOUNCE] libreoffice-4.0.3.2 tag created

[Petr Mladek]

Hi,

there have been created the tag libreoffice-4.0.3.2, aka rc2. The
corresponding official builds will be available within next few days.
It will be used as final if no blocker is found.

See the attached list of changes against 4.0.3.1.

Now, you might switch your current 4-0 source tree to it using:

./g fetch --tags
./g checkout -b tag-libreoffice-4.0.3.2 libreoffice-4.0.3.2

Linux distro packages might find source tarballs at
http://dev-builds.libreoffice.org/pre-releases/src/
They will be available from the official page together with the builds.


See also the schedule at 
http://wiki.documentfoundation.org/ReleasePlan#4.0_release
and release criteria at http://wiki.documentfoundation.org/Release_Criteria


Best Regards,
Petr

fdo#40100 EDITING YEARFRAC function returns incorrect results for some dates [Winfried Donkers]
fdo#58949 FILEOPEN: DOCX-filter; DOC format formulas embedded in OOXML (DOCX) file, don’t save and don’t edit [Miklos Vajna]
fdo#59259 With some master pages, freezes when try to print [Jan Holesovsky]
fdo#60280 PRINTING of TABLE borders, borders around paragraphs and footer, some graphic elements suppressed by OLE objects in document [Michael Stahl]
fdo#62815 SLIDESHOW: Slideshow does not open [Michael Meeks]
fdo#63306 BASIC: FileDateTime Function [Eike Rathke]
* {{fdo|40100}} EDITING YEARFRAC function returns incorrect results for some 
dates [Winfried Donkers]
* {{fdo|58949}} FILEOPEN: DOCX-filter; DOC format formulas embedded in OOXML 
(DOCX) file, don’t save and don’t edit [Miklos Vajna]
* {{fdo|59259}} With some master pages, freezes when try to print [Jan 
Holesovsky]
* {{fdo|60280}} PRINTING of TABLE borders, borders around paragraphs and 
footer, some graphic elements suppressed by OLE objects in document [Michael 
Stahl]
* {{fdo|62815}} SLIDESHOW: Slideshow does not open [Michael Meeks]
* {{fdo|63306}} BASIC: FileDateTime Function [Eike Rathke]
+ common
+ version 4.0.3.2, tag libreoffice-4.0.3.2 [Petr Mladek]
+ core
+ EmbeddedObjectContainer: guard against embed::WrongStateException (fdo#58949) [Miklos Vajna]
+ fixed a mess of out of bounds string accesses [Eike Rathke]
+ fixed out of bounds vector access [Eike Rathke]
+ make function YEARFRAC comply with ODFF Version1.2 (fdo#40100) [Winfried Donkers]
+ personas: Now they are called 'Themes', and changed location. [Jan Holesovsky]
+ remove the 4th option from the pivot table source selection dialog. [Kohei Yoshida]
+ revert svformatter already accept OUString input, (fdo#63306) [Eike Rathke]
+ suppress the expensive parts when we are only writing to metafile. (fdo#59259) [Jan Holesovsky]
+ sw: restore anti-aliasing for all OLE objects (fdo#60280) [Michael Stahl]
+ tolerate crazy / out-of-bound ScreenNumbers for FullScreen (fdo#62815) [Michael Meeks]
+ updated core [Andras Timar]
+ uploading new fresh wonderful libvisio-0.0.26 [Fridrich Štrba]
+ translations
+ update translations for LibreOffice 4.0.3 rc2 [Andras Timar]
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Tor Lillqvist]

 cui/source/uno/services.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bf3f3668c8962936bc7d4d5f19427f711bf90677
Author: Tor Lillqvist t...@iki.fi
Date:   Tue Apr 30 17:44:45 2013 +0300

Bin rtl:: namespace prefix for OUString that had crept back

Change-Id: I64ab5fd3268a9366ddfec823e7d936b5790f23e1

diff --git a/cui/source/uno/services.cxx b/cui/source/uno/services.cxx
index f5aa9cb..e9e798a 100644
--- a/cui/source/uno/services.cxx
+++ b/cui/source/uno/services.cxx
@@ -25,9 +25,9 @@
 using namespace com::sun::star;
 
 namespace cui {
-extern rtl::OUString SAL_CALL ColorPicker_getImplementationName();
+extern OUString SAL_CALL ColorPicker_getImplementationName();
 extern uno::Reference uno::XInterface  SAL_CALL ColorPicker_createInstance( 
uno::Reference uno::XComponentContext  const  ) SAL_THROW( (uno::Exception) 
);
-extern uno::Sequence rtl::OUString  SAL_CALL 
ColorPicker_getSupportedServiceNames() throw( uno::RuntimeException );
+extern uno::Sequence OUString  SAL_CALL 
ColorPicker_getSupportedServiceNames() throw( uno::RuntimeException );
 }
 
 namespace
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

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

Bug 6 depends on bug 51253, which changed state.

Bug 51253 Summary: EDITING: CRASH when undo leads to a deleted style
https://bugs.freedesktop.org/show_bug.cgi?id=51253

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

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

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

[Caolán McNamara]

 cui/source/inc/backgrnd.hxx   |1 
 cui/source/tabpages/backgrnd.cxx  |   20 +--
 cui/uiconfig/ui/backgroundpage.ui |  213 +-
 svx/source/dialog/dlgctrl.cxx |8 +
 4 files changed, 139 insertions(+), 103 deletions(-)

New commits:
commit 930582f5bcb3dc2e9a05d5ec38cdc11f35b92cc3
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Apr 30 15:56:24 2013 +0100

rework background page to balance the preview and controls

a) expand to fit the available space
b) make the controls and the preview the same size
c) reorganize the three options of color, gradient and bitmap to all put the
preview in the same place and adjust so the preview is the same size in each
case, i.e. switching between views gives the impression of a single shared
preview element
d) put a border around the gradient list so its area is visually noticable
to be the same size as its preview area

Change-Id: I88735778bb482f9dd011f890d170be127877367a

diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index b5967f7..c3e13b9 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -101,6 +101,7 @@ private:
 SfxItemSet m_rXFillSet;
 
 // Background Bitmap --
+VclContainer*   m_pBitmapContainer;
 VclContainer*   m_pFileFrame;
 PushButton* m_pBtnBrowse;
 CheckBox*   m_pBtnLink;
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 3cc1f45..3b94fdf 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -378,6 +378,7 @@ SvxBackgroundTabPage::SvxBackgroundTabPage(Window* pParent, 
const SfxItemSet rC
 m_pCtlPreview-set_width_request(aSize.Width());
 m_pCtlPreview-set_height_request(aSize.Height());
 
+get(m_pBitmapContainer, graphicgrid);
 get(m_pFileFrame, fileframe);
 get(m_pBtnBrowse, browse);
 get(m_pBtnLink, link);
@@ -1262,7 +1263,8 @@ void SvxBackgroundTabPage::ShowBitmapUI_Impl()
 HideColorUI_Impl();
 HideGradientUI_Impl();
 
-m_pBtnPreview-Show();
+
+m_pBitmapContainer-Show();
 
 m_pFileFrame-Show();
 m_pBtnLink-Show(!bLinkOnly  ! nHtmlMode  HTMLMODE_ON);
@@ -1270,6 +1272,7 @@ void SvxBackgroundTabPage::ShowBitmapUI_Impl()
 m_pTypeFrame-Show();
 
 m_pPreviewWin2-Show();
+m_pBtnPreview-Show();
 
 m_pGraphTransFrame-Show(bGraphTransparency);
 m_pColTransFT-Show(sal_False);
@@ -1279,15 +1282,12 @@ void SvxBackgroundTabPage::ShowBitmapUI_Impl()
 
 void SvxBackgroundTabPage::HideBitmapUI_Impl()
 {
-m_pBtnPreview-Hide();
-
-m_pFileFrame-Hide();
-
-m_pTypeFrame-Hide();
-
-m_pPreviewWin2-Hide();
-
-m_pGraphTransFrame-Hide();
+m_pBitmapContainer-Hide();
+m_pFileFrame-Hide();
+m_pTypeFrame-Hide();
+m_pPreviewWin2-Hide();
+m_pBtnPreview-Hide();
+m_pGraphTransFrame-Hide();
 }
 
 void SvxBackgroundTabPage::ShowGradientUI_Impl()
diff --git a/cui/uiconfig/ui/backgroundpage.ui 
b/cui/uiconfig/ui/backgroundpage.ui
index 3cf82c1..3182e28 100644
--- a/cui/uiconfig/ui/backgroundpage.ui
+++ b/cui/uiconfig/ui/backgroundpage.ui
@@ -1,6 +1,7 @@
 ?xml version=1.0 encoding=UTF-8?
 interface
   !-- interface-requires gtk+ 3.0 --
+  !-- interface-requires LibreOffice 1.0 --
   object class=GtkAdjustment id=adjustment1
 property name=upper100/property
 property name=step_increment5/property
@@ -135,39 +136,28 @@
 property name=top_padding6/property
 property name=left_padding12/property
 child
-  object class=GtkGrid id=grid3
+  object class=GtkGrid id=grid2
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=hexpandTrue/property
 property name=vexpandTrue/property
-property name=row_spacing4/property
-property name=column_spacing42/property
-child
-  object class=svtlo-ValueSet id=backgroundcolorset
-property name=width_request150/property
-property name=height_request250/property
-property name=visibleTrue/property
-property name=can_focusTrue/property
-property name=borderTrue/property
-  /object
-  packing
-property name=left_attach0/property
-property name=top_attach0/property
-property name=width1/property
-property name=height2/property
-  /packing
-/child
+property name=column_spacing24/property
+property name=column_homogeneousTrue/property
 child
   

[Libreoffice-commits] core.git: sdext/Executable_pdf2xml.mk

[Thorsten Behrens]

 sdext/Executable_pdf2xml.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f33753e507ffdd9fe3e5df1fac92b880cb574124
Author: Thorsten Behrens tbehr...@suse.com
Date:   Tue Apr 30 17:04:22 2013 +0200

pdf2xml implicitely needs cppunit headers.

Change-Id: I070ed7ebc0b470bf03be17031455f682b7872087

diff --git a/sdext/Executable_pdf2xml.mk b/sdext/Executable_pdf2xml.mk
index 38a591d..b9c9392 100644
--- a/sdext/Executable_pdf2xml.mk
+++ b/sdext/Executable_pdf2xml.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_Executable_use_sdk_api,pdf2xml))
 
 $(eval $(call gb_Executable_use_externals,pdf2xml,\
 boost_headers \
+cppunit \
 zlib \
 ))
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/Library_sc.mk sc/source

[Kohei Yoshida]

 sc/Library_sc.mk |1 
 sc/inc/column.hxx|2 
 sc/inc/formulacell.hxx   |4 -
 sc/inc/formulagroup.hxx  |   22 
 sc/inc/types.hxx |3 +
 sc/source/core/data/column2.cxx  |1 
 sc/source/core/data/formulacell.cxx  |   77 ++--
 sc/source/core/tool/formulagroup.cxx |   96 +++
 8 files changed, 130 insertions(+), 76 deletions(-)

New commits:
commit 598fe47e7023abbe2c1f6859cefa395a09eddefe
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Tue Apr 30 11:16:21 2013 -0400

Move the group calculation code into its own class.

To isolate the code that will be re-written for true vectorized
calculation...

Change-Id: I3ccd15841ed6fcdc6a22a590ba82d46d0b4863c5

diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index fe5b4b1..f7be65cc 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -190,6 +190,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/core/tool/doubleref \
sc/source/core/tool/editutil \
sc/source/core/tool/filtopt \
+   sc/source/core/tool/formulagroup \
sc/source/core/tool/formulaopt \
sc/source/core/tool/formulaparserpool \
sc/source/core/tool/formularesult \
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index e70f108..e0773aa 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -82,8 +82,6 @@ struct ScFormulaCellGroup;
 struct ScRefCellValue;
 class ScDocumentImport;
 
-typedef ::boost::intrusive_ptrScFormulaCellGroup ScFormulaCellGroupRef;
-
 struct ScNeededSizeOptions
 {
 const ScPatternAttr*pPattern;
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index e4f1cfa..2a8546f 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -51,8 +51,6 @@ inline void intrusive_ptr_release(ScFormulaCellGroup *p)
 delete p;
 }
 
-typedef ::boost::intrusive_ptrScFormulaCellGroup ScFormulaCellGroupRef;
-
 enum ScMatrixMode {
 MM_NONE  = 0,   // No matrix formula
 MM_FORMULA   = 1,   // Upper left matrix formula cell
@@ -282,6 +280,8 @@ public:
  */
 voidSetResultDouble( double n ) { aResult.SetDouble( n); }
 
+void SetResultToken( const formula::FormulaToken* pToken );
+
 double GetResultDouble() const { return aResult.GetDouble(); }
 
 voidSetErrCode( sal_uInt16 n );
diff --git a/sc/inc/formulagroup.hxx b/sc/inc/formulagroup.hxx
index 0a8e3f7..55f6e09 100644
--- a/sc/inc/formulagroup.hxx
+++ b/sc/inc/formulagroup.hxx
@@ -10,9 +10,15 @@
 #ifndef SC_FORMULAGROUP_HXX
 #define SC_FORMULAGROUP_HXX
 
+#include address.hxx
+#include types.hxx
+
 #include boost/noncopyable.hpp
 #include boost/ptr_container/ptr_vector.hpp
 
+class ScDocument;
+class ScTokenArray;
+
 namespace sc {
 
 struct FormulaGroupContext : boost::noncopyable
@@ -23,6 +29,22 @@ struct FormulaGroupContext : boost::noncopyable
 ArrayStoreType maArrays;
 };
 
+/**
+ * All the vectorized formula calculation code should be collectd here.
+ */
+class FormulaGroupInterpreter
+{
+ScDocument mrDoc;
+ScAddress maTopPos;
+ScFormulaCellGroupRef mxGroup;
+ScTokenArray mrCode;
+public:
+FormulaGroupInterpreter(
+ScDocument rDoc, const ScAddress rTopPos, const 
ScFormulaCellGroupRef xGroup, ScTokenArray rCode);
+
+bool interpret();
+};
+
 }
 
 #endif
diff --git a/sc/inc/types.hxx b/sc/inc/types.hxx
index aa20043..0a97b25 100644
--- a/sc/inc/types.hxx
+++ b/sc/inc/types.hxx
@@ -39,6 +39,9 @@ typedef ::boost::intrusive_ptrconst ScMatrix  
ScConstMatrixRef;
 class ScToken;
 typedef ::boost::intrusive_ptrScToken ScTokenRef;
 
+struct ScFormulaCellGroup;
+typedef ::boost::intrusive_ptrScFormulaCellGroup ScFormulaCellGroupRef;
+
 /**
  * When vectorization is enabled, we could potentially mass-calculate a
  * series of formula token arrays in adjacent formula cells in one step,
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 2e20d0f..c93e043 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1665,7 +1665,6 @@ bool ScColumn::ResolveStaticReference( ScMatrix rMat, 
SCCOL nMatCol, SCROW nRow
 const double* ScColumn::FetchDoubleArray( sc::FormulaGroupContext /*rCxt*/, 
SCROW nRow1, SCROW nRow2 ) const
 {
 // TODO: I'll use the context object later.
-
 if (nRow1  nRow2)
 return NULL;
 
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 3e85a9e..d271edc 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1611,6 +1611,10 @@ bool ScFormulaCell::IsDirtyOrInTableOpDirty() const
 return bDirty || (bTableOpDirty  pDocument-IsInInterpreterTableOp());
 }
 
+void ScFormulaCell::SetResultToken( const formula::FormulaToken* pToken )
+{
+aResult.SetToken(pToken);
+}
 
 void 

Wizard Integration

[Jorge Luis Roque Alvarez]

Hi,

Iam new in LO Development, i wrote an small wizard in java  i notice that 
the defaults wizards are been migrated to python but i still want to include it 
in my local LO since it will of great help for me. Can anyone give some advised 
or a quick tutorial of the steps i should follow to include my wizard in my 
currently installed LO or in my local LO source(clone from here 
http://anongit.freedesktop.org/git/libreoffice/core.git) to be build later.

thanks in advanced
jorge luis
http://www.uci.cu
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Armin Le Grand]

 svl/source/items/style.cxx|   21 ++--
 svx/inc/svx/svdundo.hxx   |   11 +---
 svx/source/svdraw/svdundo.cxx |   53 ++
 3 files changed, 63 insertions(+), 22 deletions(-)

New commits:
commit f57fbde51a16d3d7f73eba67420a506d82e16cda
Author: Armin Le Grand a...@apache.org
Date:   Wed Jun 20 08:17:23 2012 +

i#120015# Let SdrUndoAttrObj remember a reference to the used style to 
survive

removal of the style by UI (which creates no undo actions). Re-add the
style when undoing if needed.

Change-Id: I6069a1cb42dfaeb0dd35fdc15687fd307f2b641e
(cherry picked from commit 4c8ffa01131f2df2b314218731d83bd776944802)

Signed-off-by: Thorsten Behrens tbehr...@suse.com

diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index 6df5bfa..ea08cc3 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -765,14 +765,19 @@ void SfxStyleSheetBasePool::Remove( SfxStyleSheetBase* p )
 // Alle Styles umsetzen, deren Parent dieser hier ist
 ChangeParent( p-GetName(), p-GetParent() );
 
-com::sun::star::uno::Reference com::sun::star::lang::XComponent  
xComp( static_cast ::cppu::OWeakObject* ((*aIter).get()), 
com::sun::star::uno::UNO_QUERY );
-if( xComp.is() ) try
-{
-xComp-dispose();
-}
-catch( com::sun::star::uno::Exception )
-{
-}
+// #120015# Do not dispose, the removed StyleSheet may still be 
used in
+// existing SdrUndoAttrObj incarnations. Rely on refcounting for 
disposal,
+// this works well under normal conditions (checked breaking and 
counting
+// on SfxStyleSheetBase constructors and destructors)
+//
+// com::sun::star::uno::Reference 
com::sun::star::lang::XComponent  xComp( static_cast ::cppu::OWeakObject* 
((*aIter).get()), com::sun::star::uno::UNO_QUERY );
+// if( xComp.is() ) try
+// {
+//  xComp-dispose();
+// }
+// catch( com::sun::star::uno::Exception )
+// {
+// }
 
 aStyles.erase(aIter);
 Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_ERASED, *p ) );
diff --git a/svx/inc/svx/svdundo.hxx b/svx/inc/svx/svdundo.hxx
index 2221164..78d9a9c 100644
--- a/svx/inc/svx/svdundo.hxx
+++ b/svx/inc/svx/svdundo.hxx
@@ -22,8 +22,9 @@
 
 #include svl/solar.hrc
 #include svl/undo.hxx
+#include svl/style.hxx
 #include tools/gen.hxx
-#include svx/svdtypes.hxx // fuer enum RepeatFuncts
+#include svx/svdtypes.hxx // for enum RepeatFuncts
 #include svx/svdsob.hxx
 #include svx/svxdllapi.h
 
@@ -159,9 +160,8 @@ protected:
 SfxItemSet* pRepeatSet;
 
 // oder besser den StyleSheetNamen merken?
-SfxStyleSheet*  pUndoStyleSheet;
-SfxStyleSheet*  pRedoStyleSheet;
-SfxStyleSheet*  pRepeatStyleSheet;
+rtl::Reference SfxStyleSheetBase  mxUndoStyleSheet;
+rtl::Reference SfxStyleSheetBase  mxRedoStyleSheet;
 boolbStyleSheet;
 boolbHaveToTakeRedoSet;
 
@@ -174,6 +174,9 @@ protected:
 // Wenn sich um ein Gruppenobjekt handelt:
 SdrUndoGroup*   pUndoGroup;
 
+// helper to ensure StyleSheet is in pool (provided by SdrModel from 
SdrObject)
+void ensureStyleSheetInStyleSheetPool(SfxStyleSheetBasePool 
rStyleSheetPool, SfxStyleSheet rSheet);
+
 public:
 SdrUndoAttrObj(SdrObject rNewObj, bool bStyleSheet1 = false, bool 
bSaveText = false);
 virtual ~SdrUndoAttrObj();
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index c1e4b4d..c4e3c29 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -246,16 +246,29 @@ void SdrUndoObj::ImpShowPageOfThisObject()
 }
 }
 
-
+void SdrUndoAttrObj::ensureStyleSheetInStyleSheetPool(SfxStyleSheetBasePool 
rStyleSheetPool, SfxStyleSheet rSheet)
+{
+SfxStyleSheetBase* pThere = rStyleSheetPool.Find(rSheet.GetName(), 
rSheet.GetFamily());
+
+if(!pThere)
+{
+// re-insert remembered style which was removed in the meantime. To do 
this
+// without assertion, do it without parent and set parent after 
insertion
+const UniString aParent(rSheet.GetParent());
+
+rSheet.SetParent(UniString());
+rStyleSheetPool.Insert(rSheet);
+rSheet.SetParent(aParent);
+}
+}
 
 SdrUndoAttrObj::SdrUndoAttrObj(SdrObject rNewObj, bool bStyleSheet1, bool 
bSaveText)
 :   SdrUndoObj(rNewObj),
 pUndoSet(NULL),
 pRedoSet(NULL),
 pRepeatSet(NULL),
-pUndoStyleSheet(NULL),
-pRedoStyleSheet(NULL),
-pRepeatStyleSheet(NULL),
+mxUndoStyleSheet(),
+mxRedoStyleSheet(),
 bHaveToTakeRedoSet(sal_True),
  

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-3' - instsetoo_native/util solenv/inc

[Petr Mladek]

 instsetoo_native/util/openoffice.lst |   40 +--
 solenv/inc/minor.mk  |4 +--
 2 files changed, 22 insertions(+), 22 deletions(-)

New commits:
commit cc222e9c36372a5d23b0d31632f6ad7b53b76464
Author: Petr Mladek pmla...@suse.cz
Date:   Tue Apr 30 17:22:10 2013 +0200

bump product version to 4.0.3.2+, release number to 2

Change-Id: I1f021ef565ce2923eb73b34fdd53a99b2f6fdff0

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 1a2945d..b3011c5 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -4,7 +4,7 @@ Globals
 {
 variables
 {
-UREPACKAGEVERSION 4.0.3.1
+UREPACKAGEVERSION 4.0.3.2
 URELAYERVERSION 1
 REFERENCEOOOMAJORMINOR 3.4
 UNIXBASISROOTNAME libreoffice4.0
@@ -50,12 +50,12 @@ LibreOffice
 {
 PRODUCTNAME LibreOffice
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION .3.1
+PRODUCTEXTENSION .3.2
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
 BRANDPACKAGEVERSION 4.0
 USERDIRPRODUCTVERSION 4
-ABOUTBOXPRODUCTVERSION 4.0.3.1
+ABOUTBOXPRODUCTVERSION 4.0.3.2
 ABOUTBOXPRODUCTVERSIONSUFFIX +
 BASEPRODUCTVERSION 4.0
 PCPFILENAME libreoffice.pcp
@@ -65,7 +65,7 @@ LibreOffice
 FILEFORMATNAME OpenOffice.org
 FILEFORMATVERSION 1.0
 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 4.0.3.1
+PACKAGEVERSION 4.0.3.2
 PACKAGEREVISION {buildid}
 LICENSENAME LGPL
 GLOBALFILEGID gid_File_Lib_Vcl
@@ -100,13 +100,13 @@ LibreOffice_Dev
 {
 PRODUCTNAME LOdev
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION .3.1
+PRODUCTEXTENSION .3.2
 UNIXBASISROOTNAME lodev4.0
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
 BRANDPACKAGEVERSION 4.0
 USERDIRPRODUCTVERSION 4
-ABOUTBOXPRODUCTVERSION 4.0.3.1
+ABOUTBOXPRODUCTVERSION 4.0.3.2
 ABOUTBOXPRODUCTVERSIONSUFFIX +
 BASEPRODUCTVERSION 4.0
 DEVELOPMENTPRODUCT 1
@@ -121,7 +121,7 @@ LibreOffice_Dev
 FILEFORMATNAME OpenOffice.org
 FILEFORMATVERSION 1.0
 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 4.0.3.1
+PACKAGEVERSION 4.0.3.2
 PACKAGEREVISION {buildid}
 LICENSENAME LGPL
 GLOBALFILEGID gid_File_Lib_Vcl
@@ -159,9 +159,9 @@ URE
 {
 PRODUCTNAME URE
 PRODUCTVERSION 4.0
-PACKAGEVERSION 4.0.3.1
+PACKAGEVERSION 4.0.3.2
 PACKAGEREVISION 1
-PRODUCTEXTENSION .3.1
+PRODUCTEXTENSION .3.2
 BRANDPACKAGEVERSION 4.0
 LICENSENAME LGPL
 NOVERSIONINDIRNAME 1
@@ -192,11 +192,11 @@ LibreOffice_SDK
 {
 PRODUCTNAME LibreOffice
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION .3.1
+PRODUCTEXTENSION .3.2
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.3.1
+PACKAGEVERSION 4.0.3.2
 PACKAGEREVISION {buildid}
 PACK_INSTALLED 1
 DMG_VOLUMEEXTENSION SDK
@@ -231,12 +231,12 @@ LibreOffice_Dev_SDK
 {
 PRODUCTNAME LOdev
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION .3.1
+PRODUCTEXTENSION .3.2
 UNIXBASISROOTNAME lodev4.0
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.3.1
+PACKAGEVERSION 4.0.3.2
 PACKAGEREVISION {buildid}
 BASISPACKAGEPREFIX lodevbasis
 UREPACKAGEPREFIX lodev
@@ -276,11 +276,11 @@ LibreOffice_Test
 {
 PRODUCTNAME LibreOffice
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION .3.1
+PRODUCTEXTENSION .3.2
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
 BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.3.1
+PACKAGEVERSION 4.0.3.2
 PACKAGEREVISION {buildid}
 PACK_INSTALLED 1
 DMG_VOLUMEEXTENSION TEST
@@ -315,12 +315,12 @@ LibreOffice_Dev_Test
 {
 PRODUCTNAME LOdev
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION .3.1
+PRODUCTEXTENSION .3.2
 UNIXBASISROOTNAME lodev4.0
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
 BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.3.1
+

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source

[Kohei Yoshida]

 sc/inc/formulacell.hxx |2 +-
 sc/source/core/data/column.cxx |2 +-
 sc/source/core/data/formulacell.cxx|7 +++
 sc/source/core/tool/formulagroup.cxx   |3 +++
 sc/source/filter/oox/formulabuffer.cxx |2 +-
 sc/source/ui/unoobj/cellsuno.cxx   |2 +-
 6 files changed, 10 insertions(+), 8 deletions(-)

New commits:
commit 8de5aadd3c24d6d678a0103c48f53ecb212f4ebb
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Tue Apr 30 11:24:29 2013 -0400

Ensure that modified formula cells are redrawn.

ScFormulaCell::bChanged is responsible for this, though, we should only
set it to true for visible cells only. That's a TODO for later.

Change-Id: Ic237c45fb271f901320f4843c89710aedd16c906

diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 2a8546f..2d0d04c 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -192,7 +192,7 @@ public:
 voidFindRangeNamesInUse(std::setsal_uInt16 rIndexes) const;
 boolIsSubTotal() const  { return 
bSubTotal; }
 boolIsChanged() const;
-voidResetChanged();
+void SetChanged(bool b);
 boolIsEmpty();  // formula::svEmptyCell result
 // display as empty string if formula::svEmptyCell result
 boolIsEmptyDisplayedAsString();
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index da9aa3c..2933e9f 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2382,7 +2382,7 @@ void ScColumn::ResetChanged( SCROW nStartRow, SCROW 
nEndRow )
 {
 ScBaseCell* pCell = maItems[nIndex].pCell;
 if (pCell-GetCellType() == CELLTYPE_FORMULA)
-((ScFormulaCell*)pCell)-ResetChanged();
+((ScFormulaCell*)pCell)-SetChanged(false);
 ++nIndex;
 }
 }
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index d271edc..80305c2 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -2730,9 +2730,9 @@ bool ScFormulaCell::IsChanged() const
 return bChanged;
 }
 
-void ScFormulaCell::ResetChanged()
+void ScFormulaCell::SetChanged(bool b)
 {
-bChanged = false;
+bChanged = b;
 }
 
 void ScFormulaCell::CompileDBFormula()
@@ -3153,8 +3153,7 @@ bool ScFormulaCell::InterpretInvariantFormulaGroup()
 // Ensure the cell truly has a result:
 pCell-aResult = aResult;
 pCell-ResetDirty();
-
-// FIXME: there is a view / refresh missing here it appears.
+pCell-SetChanged(true);
 }
 
 return true;
diff --git a/sc/source/core/tool/formulagroup.cxx 
b/sc/source/core/tool/formulagroup.cxx
index 9f76fe2..c554e9c 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -88,7 +88,10 @@ bool FormulaGroupInterpreter::interpret()
 
 pDest-SetResultToken(aInterpreter.GetResultToken().get());
 pDest-ResetDirty();
+pDest-SetChanged(true);
 }
+
+return true;
 }
 
 }
diff --git a/sc/source/filter/oox/formulabuffer.cxx 
b/sc/source/filter/oox/formulabuffer.cxx
index 0fa6dcb..32ec1d6 100644
--- a/sc/source/filter/oox/formulabuffer.cxx
+++ b/sc/source/filter/oox/formulabuffer.cxx
@@ -151,7 +151,7 @@ void FormulaBuffer::applyCellFormulaValues( const 
std::vector ValueAddressPair
 {
 pCell-SetHybridDouble( it-second );
 pCell-ResetDirty();
-pCell-ResetChanged();
+pCell-SetChanged(false);
 }
 }
 }
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 6006181..dc40193 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -6609,7 +6609,7 @@ void SAL_CALL ScCellObj::setFormulaResult( double nValue 
) throw(uno::RuntimeExc
 ScFormulaCell* pCell = pDocSh-GetDocument()-GetFormulaCell(aCellPos);
 pCell-SetHybridDouble( nValue );
 pCell-ResetDirty();
-pCell-ResetChanged();
+pCell-SetChanged(false);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source

[Kohei Yoshida]

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

New commits:
commit ca525b2b323685c3cca1eff59fda92bff44fdc31
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Tue Apr 30 11:27:46 2013 -0400

Surpress warning on comparison between signed and unsigned.

Change-Id: Ia155114817e3b28a201f734647b758cf7cebefce

diff --git a/sc/source/core/tool/formulagroup.cxx 
b/sc/source/core/tool/formulagroup.cxx
index c554e9c..1ee57b5 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -39,7 +39,7 @@ bool FormulaGroupInterpreter::interpret()
 {
 const formula::SingleVectorRefToken* p2 = 
static_castconst formula::SingleVectorRefToken*(p);
 const double* pArray = p2-GetArray();
-aCode2.AddDouble(i  p2-GetArrayLength() ? pArray[i] : 
0.0);
+aCode2.AddDouble(static_castsize_t(i)  
p2-GetArrayLength() ? pArray[i] : 0.0);
 }
 break;
 case formula::svDoubleVectorRef:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - configure.ac

[Petr Mladek]

 configure.ac |   15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

New commits:
commit c164527f6dbb692437e70f4016ee1da82af54d1f
Author: Petr Mladek pmla...@suse.cz
Date:   Tue Apr 30 17:27:22 2013 +0200

[mono] set CSC variable on Windows as well

Change-Id: I2e556f27f718ce5d3a7494bb8fe0bc9a9601f8e4

diff --git a/configure.ac b/configure.ac
index d1b72b5..5f291d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4811,27 +4811,28 @@ if test $build_os = cygwin; then
 AL=al.exe
 
 dnl Check csc.exe
-AC_PATH_PROG(CSC_PATH, csc.exe)
+CSC=csc.exe
+AC_PATH_PROG(CSC_PATH, $CSC)
 if test -n $CSC_PATH; then
 CSC_PATH=`dirname $CSC_PATH`
 fi
 if test -n $with_csc_path; then
 with_csc_path=`cygpath -u $with_csc_path`
 else
-AC_MSG_CHECKING([for csc.exe more thoroughly])
+AC_MSG_CHECKING([for $CSC more thoroughly])
 fi
-if test -x $with_csc_path/csc.exe; then
+if test -x $with_csc_path/$CSC; then
 CSC_PATH=$with_csc_path
 else
csctest=`./oowintool --csc-compilerdir`
-   if test -x $csctest/csc.exe; then
+   if test -x $csctest/$CSC; then
CSC_PATH=$csctest
fi
 fi
-if test ! -x $CSC_PATH/csc.exe; then
-AC_MSG_ERROR([csc.exe not found. Make sure it's in the path or use 
--with-csc-path])
+if test ! -x $CSC_PATH/$CSC; then
+AC_MSG_ERROR([$CSC not found. Make sure it's in the path or use 
--with-csc-path])
 else
-AC_MSG_RESULT([$CSC_PATH/csc.exe])
+AC_MSG_RESULT([$CSC_PATH/$CSC])
 fi
 # Convert to posix path with 8.3 filename restrictions ( No spaces )
 CSC_PATH=`cygpath -d $CSC_PATH`
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

How to grab web data into libre office calc ? Or Addons to grab specific web data into libre calc‏

[Supiramani Supiramani]

Hi
 
Preamble ...

*I've been on the m$ office treadmill for 15 + years 
*I've always been scared of Linux and thought it was all command line
*Recently stumbled on Ubuntu Linux and libre office ...so I am  completely new 
to
libre office
*Used it for a few days ... Truly it's a great piece of software and 
dispelled most of my doubts on Linux, using Linux, libre office etc etc 
 
Question / request reading 
--
*However some specific doubts remain on libre office 
*I've been using M$ XL's add on for grabbing web data , called smf add in 
*When activated, once could easily grab specific pages, specific cells of
web pages directly into xl ( without opening a web browser)
*This is a great time saver 
*The only and only /  excellent  group for using smf add in  can be found at
http://finance.groups.yahoo.com/group/smf_addin/
*Some  basic write up on using smf add in can be found here
http://seekingalpha.com/instablog/326478-derek-a-barrett/1414481-automating-alpha-getting-started-with-stock-market-functions-smf-add-in-for-excel
 
Now, my question is , is there a similar add in for libre office, when
invoked , could help the user  get specific cells ( not the whole web page )
from a URL  into libre xl sheets ? Of course the user supplies the URL 
 
Or is there some app in Linux that can do the same ? 
 
How do people grab specific web data ( not entire pages ) but specific data
for web pages into libre calc ?
 
 
**IF such a web add in exists I am ready to join the testing community **


Request to Moderators ; if I am posting on the wrong area or group please
most this post accordingly



Thanks in advance
Regards
 
 
 
 
 
 
 
 
 
  ___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

License Statement

[Tomofumi Yagi]

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

Regards,
Tomofumi Yagi

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

[PATCH] Proof of concept - conversion operator for uno::Reference

[Thorsten Behrens (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3698

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/98/3698/1

Proof of concept - conversion operator for uno::Reference

Change-Id: I589b57c0a54524460fc8518a456dc09797c3567a
---
M include/com/sun/star/uno/Reference.h
M include/com/sun/star/uno/Reference.hxx
2 files changed, 56 insertions(+), 5 deletions(-)



diff --git a/include/com/sun/star/uno/Reference.h 
b/include/com/sun/star/uno/Reference.h
index 94551a0..2b776b8 100644
--- a/include/com/sun/star/uno/Reference.h
+++ b/include/com/sun/star/uno/Reference.h
@@ -19,6 +19,8 @@
 #ifndef _COM_SUN_STAR_UNO_REFERENCE_H_
 #define _COM_SUN_STAR_UNO_REFERENCE_H_
 
+#include boost/config.hpp // for BOOST_NO_MEMBER_TEMPLATE_FRIENDS macro
+
 #include rtl/alloc.h
 
 
@@ -54,10 +56,6 @@
 class BaseReference
 {
 protected:
-/** the interface pointer
-*/
-XInterface * _pInterface;
-
 /** Queries given interface for type rType.
 
 @param pInterface interface pointer
@@ -77,6 +75,19 @@
 inline static XInterface * SAL_CALL iquery_throw( XInterface * pInterface, 
const Type  rType )
 SAL_THROW( (RuntimeException) );
 #endif
+
+// if member template friends don't work, make protected _pInterface
+// public, to allow template copy constructor from Reference to access
+// them.
+#ifndef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
+templatetypename T friend class Reference;
+#else
+public:
+#endif
+
+/** the interface pointer
+*/
+XInterface * _pInterface;
 
 public:
 /** Gets interface pointer. This call does not acquire the interface.
@@ -332,6 +343,15 @@
 inline Reference( interface_type * pInterface, UnoReference_SetThrow dummy 
) SAL_THROW( (RuntimeException) );
 #endif
 
+/* Constructor: copy-construct from derived interface
+
+   @param rRef
+   Interface reference that must be convertible to interface_type
+   (typically, this implies that interface_type is a basetype of
+   the passed type)
+ */
+template class Ifc  inline Reference( const ReferenceIfc rRef );
+
 /** Cast operator to Reference XInterface : Reference objects are binary 
compatible and
 any interface must be derived from com.sun.star.uno.XInterface.
 This a useful direct cast possibility.
@@ -485,6 +505,18 @@
 */
 inline Reference interface_type   SAL_CALL operator = ( const 
Reference interface_type   rRef ) SAL_THROW(());
 
+/** Assignment operator for derived interfaces: Acquires given
+interface reference and sets reference.  An interface already
+set will be released.
+
+@param rRef
+Interface reference that must be convertible to interface_type
+(typically, this implies that interface_type is a basetype of
+the passed type)
+ */
+template class Ifc 
+inline Reference interface_type   SAL_CALL operator = ( const 
ReferenceIfc rRef );
+
 /** Queries given interface reference for type interface_type.
 
 @param rRef interface reference
diff --git a/include/com/sun/star/uno/Reference.hxx 
b/include/com/sun/star/uno/Reference.hxx
index aa39810..9b84809 100644
--- a/include/com/sun/star/uno/Reference.hxx
+++ b/include/com/sun/star/uno/Reference.hxx
@@ -193,7 +193,16 @@
 _pInterface = castToXInterface( iset_throw( pInterface ) );
 }
 #endif
-
+//__
+template class interface_type 
+template class Ifc 
+inline Reference interface_type ::Reference( const ReferenceIfc rRef )
+{
+interface_type* pTmp = reinterpret_cast Ifc* (rRef._pInterface);
+_pInterface = pTmp;
+if (_pInterface)
+_pInterface-acquire();
+}
 
//__
 template class interface_type 
 inline void Reference interface_type ::clear() SAL_THROW(())
@@ -332,6 +341,16 @@
 set( castFromXInterface( rRef._pInterface ) );
 return *this;
 }
+//__
+template class interface_type 
+template class Ifc 
+inline Reference interface_type   Reference interface_type ::operator = (
+const ReferenceIfc rRef )
+{
+interface_type* pTmp = reinterpret_cast Ifc* (rRef._pInterface);
+set( pTmp );
+return *this;
+}
 
 
//__
 template class interface_type 

-- 
To view, visit https://gerrit.libreoffice.org/3698
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I589b57c0a54524460fc8518a456dc09797c3567a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Thorsten Behrens tbehr...@suse.com

___
LibreOffice mailing list

[Libreoffice-commits] core.git: 6 commits - config_host.mk.in configure.ac desktop/Module_desktop.mk desktop/Package_branding_custom.mk desktop/Package_branding.mk desktop/Package_intro.mk desktop/Zip

[David Tardon]

 config_host.mk.in|   12 -
 configure.ac |   38 +
 desktop/Module_desktop.mk|5 
 desktop/Package_branding.mk  |   27 
 desktop/Package_branding_custom.mk   |   22 +++
 desktop/Package_intro.mk |   17 --
 desktop/Zip_brand.mk |   60 -
 desktop/Zip_brand_dev.mk |   60 -
 desktop/Zip_shell.mk |   21 ---
 extensions/Module_extensions.mk  |3 
 extensions/Package_OOoSpotlightImporter.mk   |   16 ++
 extensions/Package_mdibundle.mk  |   20 +++
 extensions/Zip_mdibundle.mk  |   19 --
 libexttextcat/ExternalPackage_fingerprint.mk |  172 ++
 libexttextcat/Module_libexttextcat.mk|2 
 libexttextcat/Zip_fingerprint.mk |  174 ---
 odk/CustomTarget_check.mk|2 
 odk/CustomTarget_classes.mk  |9 -
 odk/Module_odk.mk|2 
 odk/Package_uno_loader_classes.mk|   25 +++
 odk/Zip_uno_loader_classes.mk|   20 ---
 scp2/InstallModule_ooo.mk|1 
 scp2/source/ooo/common_brand.scp |   23 +++
 scp2/source/ooo/file_ooo.scp |   35 +++--
 scp2/source/ooo/module_hidden_ooo.scp|1 
 scp2/source/sdkoo/sdkoo.scp  |6 
 scripting/Module_scripting.mk|3 
 scripting/Package_java.mk|   23 +++
 scripting/Package_java_jars.mk   |   18 ++
 scripting/Zip_ScriptsJava.mk |   50 ---
 30 files changed, 403 insertions(+), 483 deletions(-)

New commits:
commit 674a7b44f3b9a90b0b6ed7fa8928ccd0efb597f8
Author: David Tardon dtar...@redhat.com
Date:   Tue Apr 30 17:44:21 2013 +0200

install branding images using filelists

This also reinstates the use of brand_dev/intro.png for non-release
builds, lost with gbuildization of instsetoo_native (commit
1d84e9d1d363bd550129efcbeafe670c0a049dd0).

Change-Id: I43477505c5c9a3d6ec961d640608e6e91379868e

diff --git a/config_host.mk.in b/config_host.mk.in
index 82dfd50..8696a92 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -12,7 +12,6 @@ gb_SPACE:=$(gb_SPACE) $(gb_SPACE)
 export SRC_ROOT=@SRC_ROOT@
 export BUILDDIR=@BUILDDIR@
 
-export ABOUT_BACKGROUND_SVG=@ABOUT_BACKGROUND_SVG@
 @x_AFLAGS@ export AFLAGS=@AFLAGS@
 export ALLOC=@ALLOC@
 export ALL_LANGS=@ALL_LANGS@
@@ -36,6 +35,7 @@ export BOOST_CXXFLAGS=@BOOST_CXXFLAGS@
 export BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@
 export BOOST_LDFLAGS=@BOOST_LDFLAGS@
 export BOOST_SYSTEM_LIB=@BOOST_SYSTEM_LIB@
+export BRAND_INTRO_IMAGES=@BRAND_INTRO_IMAGES@
 export BSH_JAR=@BSH_JAR@
 export BUILD_PLATFORM=@build@
 export BUILD_POSTGRESQL_SDBC=@BUILD_POSTGRESQL_SDBC@
@@ -75,6 +75,8 @@ export CROSS_COMPILING=@CROSS_COMPILING@
 export CURL=@CURL@
 export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@
 export CURL_LIBS=$(gb_SPACE)@CURL_LIBS@
+export CUSTOM_BRAND_DIR=@CUSTOM_BRAND_DIR@
+export CUSTOM_BRAND_IMAGES=@CUSTOM_BRAND_IMAGES@
 export CXX=@CXX@
 export CXX_FOR_BUILD=@CXX_FOR_BUILD@
 export CXX_X64_BINARY=@CXX_X64_BINARY@
@@ -85,6 +87,7 @@ export DBUSMENUGTK_CFLAGS=$(gb_SPACE)@DBUSMENUGTK_CFLAGS@
 export DBUSMENUGTK_LIBS=$(gb_SPACE)@DBUSMENUGTK_LIBS@
 export DBUS_CFLAGS=$(gb_SPACE)@DBUS_CFLAGS@
 export DBUS_LIBS=$(gb_SPACE)@DBUS_LIBS@
+export DEFAULT_BRAND_IMAGES=@DEFAULT_BRAND_IMAGES@
 export DEFAULT_TO_ENGLISH_FOR_PACKING=yes
 export DEVINSTALLDIR=@DEVINSTALLDIR@
 export DIAGRAM_EXTENSION_PACK=@DIAGRAM_EXTENSION_PACK@
@@ -168,7 +171,6 @@ export EPM_FLAGS=@EPM_FLAGS@
 export EXTERNAL_WARNINGS_NOT_ERRORS=@EXTERNAL_WARNINGS_NOT_ERRORS@
 export debug=@ENABLE_DEBUG@
 @x_Cygwin@ export FIND=@WIN_FIND@
-export FLAT_LOGO_SVG=@FLAT_LOGO_SVG@
 export FLEX=@FLEX@
 export FLUTE_JAR=@FLUTE_JAR@
 export FONTCONFIG_CFLAGS=$(gb_SPACE)@FONTCONFIG_CFLAGS@
@@ -257,7 +259,6 @@ export INPATH_FOR_BUILD=@INPATH_FOR_BUILD@
 export INSTDIR=@INSTDIR@
 export INSTALLDIR=@INSTALLDIR@
 export INSTALLDIRNAME=@INSTALLDIRNAME@
-export INTRO_BITMAP=@INTRO_BITMAP@
 export JAVACISGCJ=@JAVACISGCJ@
 export JAVACISKAFFE=@JAVACISKAFFE@
 export JAVACOMPILER=@JAVACOMPILER@
@@ -456,11 +457,6 @@ export SOLAR_JAVA=@SOLAR_JAVA@
 export SPLIT_APP_MODULES=@SPLIT_APP_MODULES@
 export SPLIT_OPT_FEATURES=@SPLIT_OPT_FEATURES@
 export SRCDIR=@SRC_ROOT@
-export STARTCENTER_LEFT_BITMAP=@STARTCENTER_LEFT_BITMAP@
-export STARTCENTER_RIGHT_BITMAP=@STARTCENTER_RIGHT_BITMAP@
-export STARTCENTER_RTL_LEFT_BITMAP=@STARTCENTER_RTL_LEFT_BITMAP@
-export STARTCENTER_RTL_RIGHT_BITMAP=@STARTCENTER_RTL_RIGHT_BITMAP@
-export STARTCENTER_SPACE_BITMAP=@STARTCENTER_SPACE_BITMAP@
 export STRIP=@STRIP@
 export STRIP_COMPONENTS=@STRIP_COMPONENTS@
 export SUNTEMPLATES_DE_PACK=@SUNTEMPLATES_DE_PACK@
diff --git a/configure.ac b/configure.ac
index 

Re: conversion operators for UNO

[Thorsten Behrens]

 On 04/25/2013 10:35 AM, Noel Grandin wrote:
 I want to change things so that I can write:
void bar() {
ReferenceB b = 
methodThatTakesA( b );
}

Yeah. One of my older pet peeves...

Stephan Bergmann wrote:
 This has been discussed before more than once, but I tend to forget
 whether it has never gone past discussion stage because the
 implementation would be slightly tricky (using SFNIAE to restrict
 implicit conversions from ReferenceB to ReferenceA to cases
 where B is derived from A) or because there was some fundamental
 flaw with it.

Works by and large with the proof of concept from

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

, the only problem I recall, is a slight performance degradation,
since IIRC then operator ReferenceXInterface needs to go due to
ambiguities (which avoids temporaries). Possibly offset nicely by
needing much less queryInterfaces...

Cheers,

-- Thorsten


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

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - sfx2/inc

[Tor Lillqvist]

 sfx2/inc/sfx2/tbxctrl.hxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit a5b6a379a2d628040db98060c2adfe8f2fac5607
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Tue Apr 30 15:26:07 2013 +0300

MSVC: member of dll interface class may not be declared with dll interface

Change-Id: I751832d8725354cebd892738fa80fd7bc5e43925

diff --git a/sfx2/inc/sfx2/tbxctrl.hxx b/sfx2/inc/sfx2/tbxctrl.hxx
index 728cee9..5b6b1e4 100644
--- a/sfx2/inc/sfx2/tbxctrl.hxx
+++ b/sfx2/inc/sfx2/tbxctrl.hxx
@@ -163,7 +163,7 @@ public:
 
 #define SFX_DECL_TOOLBOX_CONTROL() \
 static SfxToolBoxControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 
nId, ToolBox rTbx ); \
-static void SFX2_DLLPUBLIC RegisterControl(sal_uInt16 nSlotId = 0, 
SfxModule *pMod=NULL)
+static void RegisterControl(sal_uInt16 nSlotId = 0, SfxModule 
*pMod=NULL)
 
 /*  For special ToolBox controls, such as a font selection box or toolbox
 tear-off floating windows, an appropriate Item-Subclass of SfxTooBoxControl
@@ -361,7 +361,11 @@ module initialization has to call RegisterControl().
 class SfxRecentFilesToolBoxControl : public SfxToolBoxControl
 {
 public:
-SFX_DECL_TOOLBOX_CONTROL();
+// We don't use SFX_DECL_TOOLBOX_CONTROL() here as we need to have this
+// RegisterControl() marked as SFX2_DLLPUBLIC
+static SfxToolBoxControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, 
ToolBox rTbx );
+static void SFX2_DLLPUBLIC RegisterControl(sal_uInt16 nSlotId = 0, 
SfxModule *pMod=NULL);
+
 SfxRecentFilesToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox 
rBox );
 virtual ~SfxRecentFilesToolBoxControl();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[David Tardon]

 scp2/source/ooo/common_brand.scp |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit b16cb2291e6377de9beb7952c69251ff2a973ffa
Author: David Tardon dtar...@redhat.com
Date:   Tue Apr 30 18:07:18 2013 +0200

fix mismerge

Change-Id: I6ece86dfdd99e30bc6aade1a769f8ff9290b4a72

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 28c1dca..7bf576c 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -628,13 +628,6 @@ File gid_Brand_File_Bmp_IntroAboutShell_custom
 End
 #endif
 
-File gid_Brand_File_Images_Brand_Zip
-TXT_FILE_BODY;
-Dir = gid_Brand_Dir_Share_Config;
-Name = images_brand.zip;
-Styles = (PACKED);
-End
-
 File gid_Brand_File_Txt_Package
 TXT_FILE_BODY;
 Dir = gid_Brand_Dir_Share_Extensions;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Matúš Kukan]

 solenv/gbuild/platform/IOS_ARM_GCC.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 102f68ea54e7b9420a8f13605289a5411db5512b
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Tue Apr 30 18:10:54 2013 +0200

fix typo: trailing \

regression from 22e1a5b836b898298b6a5cfbaf1c82d9c3f08349

Change-Id: Ia7dbad2fdad9c00c86a55395308dc35ecc510dee

diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk 
b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index 13a9b08..6f63590 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -95,7 +95,7 @@ gb_LinkTarget_OBJCFLAGS += $(gb_DEBUG_CFLAGS)
 endif
 
 define gb_LinkTarget__get_liblinkflags
-$(patsubst lib%.a,-l%,$(foreach lib,$(1),$(call 
gb_Library_get_filename,$(lib \
+$(patsubst lib%.a,-l%,$(foreach lib,$(1),$(call 
gb_Library_get_filename,$(lib
 endef
 
 define gb_LinkTarget__get_layer
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/CppunitTest_sw_htmlexport.mk sw/Module_sw.mk sw/qa sw/source

[Michael Meeks]

 sw/CppunitTest_sw_htmlexport.mk|   89 +
 sw/Module_sw.mk|1 
 sw/qa/extras/htmlexport/data/fdo62336.docx |binary
 sw/qa/extras/htmlexport/htmlexport.cxx |   56 ++
 sw/qa/extras/inc/swmodeltestbase.hxx   |6 +
 sw/qa/extras/odfexport/odfexport.cxx   |1 
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx   |1 
 sw/source/filter/writer/wrtswtbl.cxx   |4 -
 8 files changed, 155 insertions(+), 3 deletions(-)

New commits:
commit 06a8ebc878ff9bcab26556d5b5a46532e232d416
Author: Michael Meeks michael.me...@suse.com
Date:   Tue Apr 30 17:31:12 2013 +0100

fdo#62336 - unit test for conversion failure.

Turns out this depends on not doing layout, and so is a real corner-case.

Change-Id: If9d2db6b1a0df94fc809fb353f2dbf2cf9ac1c9a

diff --git a/sw/CppunitTest_sw_htmlexport.mk b/sw/CppunitTest_sw_htmlexport.mk
new file mode 100644
index 000..5041627
--- /dev/null
+++ b/sw/CppunitTest_sw_htmlexport.mk
@@ -0,0 +1,89 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,sw_htmlexport))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_htmlexport, \
+sw/qa/extras/htmlexport/htmlexport \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sw_htmlexport, \
+comphelper \
+cppu \
+   cppuhelper \
+sal \
+sw \
+test \
+   tl \
+unotest \
+utl \
+vcl \
+   $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_htmlexport,\
+   boost_headers \
+libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_htmlexport,\
+-I$(SRCDIR)/sw/inc \
+-I$(SRCDIR)/sw/source/core/inc \
+   -I$(SRCDIR)/sw/qa/extras/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sw_htmlexport,\
+offapi \
+udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sw_htmlexport))
+
+$(eval $(call gb_CppunitTest_use_components,sw_htmlexport,\
+   basic/util/sb \
+comphelper/util/comphelp \
+configmgr/source/configmgr \
+embeddedobj/util/embobj \
+fileaccess/source/fileacc \
+filter/source/config/cache/filterconfig1 \
+   forms/util/frm \
+framework/util/fwk \
+i18npool/util/i18npool \
+linguistic/source/lng \
+oox/util/oox \
+package/source/xstor/xstor \
+package/util/package2 \
+sax/source/expatwrap/expwrap \
+sax/source/fastparser/fastsax \
+sw/util/sw \
+sw/util/swd \
+sw/util/msword \
+sfx2/util/sfx \
+starmath/util/sm \
+svl/source/fsstor/fsstorage \
+svtools/util/svt \
+toolkit/util/tk \
+ucb/source/core/ucb1 \
+ucb/source/ucp/file/ucpfile1 \
+unotools/util/utl \
+unoxml/source/service/unoxml \
+writerfilter/util/writerfilter \
+xmloff/util/xo \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sw_htmlexport))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sw_htmlexport))
+
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_htmlexport))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 021fda8..202c67c 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -46,6 +46,7 @@ $(eval $(call gb_Module_add_check_targets,sw,\
 ))
 
 $(eval $(call gb_Module_add_slowcheck_targets,sw,\
+CppunitTest_sw_htmlexport \
 CppunitTest_sw_macros_test \
 CppunitTest_sw_ooxmlexport \
 CppunitTest_sw_ooxmlimport \
diff --git a/sw/qa/extras/htmlexport/data/fdo62336.docx 
b/sw/qa/extras/htmlexport/data/fdo62336.docx
new file mode 100644
index 000..f14a0e0
Binary files /dev/null and b/sw/qa/extras/htmlexport/data/fdo62336.docx differ
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx 
b/sw/qa/extras/htmlexport/htmlexport.cxx
new file mode 100644
index 000..34cd2ee
--- /dev/null
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -0,0 +1,56 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include swmodeltestbase.hxx
+#include com/sun/star/awt/Gradient.hpp
+#include com/sun/star/drawing/FillStyle.hpp
+
+class Test : public SwModelTestBase
+{
+public:
+void testFdo62336();
+
+CPPUNIT_TEST_SUITE(Test);
+#if !defined(MACOSX)  !defined(WNT)
+CPPUNIT_TEST(run);
+#endif
+

[PATCH] Up-cast conversion constructor for css::uno::Reference

[Stephan Bergmann (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3699

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/99/3699/1

Up-cast conversion constructor for css::uno::Reference

Based on a previous patch by Noel Grandin,
https://gerrit.libreoffice.org/#/c/3613/, and borrowing from
boost::is_base_and_derived (see comment in include/com/sun/star/uno/Reference.h)
to avoid including Boost headers in URE headers.

Change-Id: Iade5af144dd73ef03bd7d96000134c7a66a5e591
---
M cppu/qa/test_reference.cxx
M include/com/sun/star/uno/Reference.h
M include/com/sun/star/uno/Reference.hxx
M sd/source/core/CustomAnimationEffect.cxx
4 files changed, 122 insertions(+), 1 deletion(-)



diff --git a/cppu/qa/test_reference.cxx b/cppu/qa/test_reference.cxx
index b998238..a6e3936 100644
--- a/cppu/qa/test_reference.cxx
+++ b/cppu/qa/test_reference.cxx
@@ -149,4 +149,47 @@
 
 CPPUNIT_PLUGIN_IMPLEMENT();
 
+// Check that the up-casting Reference conversion constructor catches the
+// intended cases:
+
+namespace {
+
+struct Base1: public css::uno::XInterface { virtual ~Base1() {} };
+struct Base2: public Base1 { virtual ~Base2() {} };
+struct Base3: public Base1 { virtual ~Base3() {} };
+struct Derived: public Base2, public Base3 { virtual ~Derived() {} };
+
+}
+
+// The special case using the conversion operator instead:
+css::uno::Reference css::uno::XInterface  testUpcast1(
+css::uno::Reference Derived  const  ref)
+{ return ref; }
+
+// The normal up-cast case:
+css::uno::Reference Base1  testUpcast2(
+css::uno::Reference Base2  const  ref)
+{ return ref; }
+
+// Commenting this in should cause a compiler error due to an ambiguous 
up-cast:
+/*
+css::uno::Reference Base1  testFailingUpcast3(
+css::uno::Reference Derived  const  ref)
+{ return ref; }
+*/
+
+// Commenting this in should cause a compiler error due to a down-cast:
+/*
+css::uno::Reference Base2  testFailingUpcast4(
+css::uno::Reference Base1  const  ref)
+{ return ref; }
+*/
+
+// Commenting this in should cause a compiler error due to a down-cast:
+/*
+css::uno::Reference Base1  testFailingUpcast5(
+css::uno::Reference css::uno::XInterface  const  ref)
+{ return ref; }
+*/
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/com/sun/star/uno/Reference.h 
b/include/com/sun/star/uno/Reference.h
index 94551a0..27787d3 100644
--- a/include/com/sun/star/uno/Reference.h
+++ b/include/com/sun/star/uno/Reference.h
@@ -160,6 +160,57 @@
 };
 #endif
 
+/// @cond INTERNAL
+namespace detail {
+
+// A mechanism to enable up-casts, used by the Reference conversion 
constructor,
+// but at the same time disable up-casts to XInterface, so that the conversion
+// operator for that special case is used in an expression like
+// Reference XInterface (x); heavily borrowed from boost::is_base_and_derived
+// (which manages to avoid compilation problems with ambiguous bases and cites
+// comp.lang.c++.moderated mail http://groups.google.com/groups?
+// selm=df893da6.0301280859.522081f7%40posting.google.com SuperSubclass
+// (is_base_and_derived) complete implementation! by Rani Sharoni and cites
+// Aleksey Gurtovoy for the workaround for MSVC), to avoid including Boost
+// headers in URE headers (could ultimately be based on C++11 std::is_base_of):
+
+template typename T1, typename T2  struct UpCast {
+private:
+template bool, typename U1, typename  struct C
+{ typedef U1 t; };
+
+template typename U1, typename U2  struct C false, U1, U2 
+{ typedef U2 t; };
+
+struct S { char c[2]; };
+
+#if defined _MSC_VER
+static char f(T2 *, long);
+static S f(T1 * const , int);
+#else
+template typename U  static char f(T2 *, U);
+static S f(T1 *, int);
+#endif
+
+struct H {
+H(); // avoid C2514 class has no constructors from MSVC 2008
+#if defined _MSC_VER
+operator T1 * const  () const;
+#else
+operator T1 * () const;
+#endif
+operator T2 * ();
+};
+
+public:
+typedef typename C sizeof (f(H(), 0)) == 1, void *, void ::t t;
+};
+
+template typename T2  struct UpCast XInterface, T2  {};
+
+}
+/// @endcond
+
 /** Template reference class for interface type derived from BaseReference.
 A special constructor given the UNO_QUERY identifier queries interfaces
 for reference type.
@@ -248,6 +299,21 @@
 @param rRef another reference
 */
 inline Reference( const Reference interface_type   rRef ) SAL_THROW(());
+
+/** Up-casting conversion constructor: Copies interface reference.
+
+Does not work for up-casts to ambiguous bases.  For the special case of
+up-casting to Reference XInterface , see the corresponding conversion
+operator.
+
+@param rRef another reference
+*/
+template class derived_type 
+inline Reference(
+const Reference derived_type   rRef,
+typename detail::UpCast interface_type, derived_type ::t = 0 )
+