[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 
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

[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 
Gerrit-Reviewer: Fridrich Strba 
Gerrit-Reviewer: Miklos Vajna 
Gerrit-Reviewer: Noel Grandin 
Gerrit-Reviewer: Tor Lillqvist 

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

[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 
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 
Tested-by: Tor Lillqvist 

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 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -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;
 const_cast< SdrExtrudePrimitive3D& >(*this).impCreateSlices();
 }
 
@@ -493,7 +492,6 @@ namespace drawinglayer
 {
 // conditions of last local decomposition with reduced 
lines have changed. Remem

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

[Tor Lillqvist]

 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit d6d896a121c0bab3ac27fafa5a4e810e48ec96c6
Author: Tor Lillqvist 
Date:   Tue Apr 30 08:30:00 2013 +0300

WaE: 'SAL_OVERRIDE' macro redefined

Change-Id: Ic8af47b52b06ef440b3fdaa966075780fb7a609b

diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index 7599adb..2daa5b8 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -20,6 +20,8 @@
 #ifndef INCLUDED_PDFI_OUTDEV_HXX
 #define INCLUDED_PDFI_OUTDEV_HXX
 
+#include 
+
 #if defined __GNUC__
 #pragma GCC system_header
 #elif defined __SUNPRO_CC
@@ -46,12 +48,6 @@
 #pragma warning(pop)
 #endif
 
-#if HAVE_CXX11_OVERRIDE
-#define SAL_OVERRIDE override
-#else
-#define SAL_OVERRIDE
-#endif
-
 #include 
 #include 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-4-0] Fix import of images from pdf.

[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/3690

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I565de80ce218e831e276d3a1d88ded3baee876e7
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Thorsten Behrens 
Gerrit-Reviewer: Tor Lillqvist 

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

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

[Thorsten Behrens]

 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |   24 ++-
 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |  137 --
 2 files changed, 89 insertions(+), 72 deletions(-)

New commits:
commit 822595b175316c26da1e07003263aee5e24f5006
Author: Thorsten Behrens 
Date:   Tue Apr 30 00:05:18 2013 +0200

Fix import of images from pdf.

Seems poppler changed outputdev virt func signatures with version
12, so with system poppler, we never got any image import functions
called. Added override annotation to prevent this from happening in
the future.

Change-Id: I565de80ce218e831e276d3a1d88ded3baee876e7
Reviewed-on: https://gerrit.libreoffice.org/3690
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 765d0be..03adf89 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -836,6 +836,9 @@ void PDFOutDev::endTextObject(GfxState*)
 
 void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str,
   int width, int height, GBool invert,
+#if POPPLER_CHECK_VERSION(0, 12, 0)
+  GBool /*interpolate*/,
+#endif
   GBool /*inlineImg*/ )
 {
 OutputBuffer aBuf; initBuf(aBuf);
@@ -862,6 +865,9 @@ void PDFOutDev::drawImageMask(GfxState* pState, Object*, 
Stream* str,
 
 void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
   int width, int height, GfxImageColorMap* colorMap,
+#if POPPLER_CHECK_VERSION(0, 12, 0)
+  GBool /*interpolate*/,
+#endif
   int* maskColors, GBool /*inlineImg*/ )
 {
 OutputBuffer aBuf; initBuf(aBuf);
@@ -908,9 +914,16 @@ void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
 void PDFOutDev::drawMaskedImage(GfxState*, Object*, Stream* str,
 int width, int height,
 GfxImageColorMap* colorMap,
+#if POPPLER_CHECK_VERSION(0, 12, 0)
+GBool /*interpolate*/,
+#endif
 Stream* maskStr,
 int maskWidth, int maskHeight,
-GBool maskInvert)
+GBool maskInvert
+#if POPPLER_CHECK_VERSION(0, 12, 0)
+, GBool /*maskInterpolate*/
+#endif
+   )
 {
 OutputBuffer aBuf; initBuf(aBuf);
 printf( "drawImage %d %d 0", width, height );
@@ -921,9 +934,16 @@ void PDFOutDev::drawMaskedImage(GfxState*, Object*, 
Stream* str,
 void PDFOutDev::drawSoftMaskedImage(GfxState*, Object*, Stream* str,
 int width, int height,
 GfxImageColorMap* colorMap,
+#if POPPLER_CHECK_VERSION(0, 12, 0)
+GBool /*interpolate*/,
+#endif
 Stream* maskStr,
 int maskWidth, int maskHeight,
-GfxImageColorMap* maskColorMap )
+GfxImageColorMap* maskColorMap
+#if POPPLER_CHECK_VERSION(0, 12, 0)
+, GBool /*maskInterpolate*/
+#endif
+   )
 {
 OutputBuffer aBuf; initBuf(aBuf);
 printf( "drawImage %d %d 0", width, height );
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index e5e48fc..c0977cb7 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -46,6 +46,12 @@
 #pragma warning(pop)
 #endif
 
+#if HAVE_CXX11_OVERRIDE
+#define SAL_OVERRIDE override
+#else
+#define SAL_OVERRIDE
+#endif
+
 #include 
 #include 
 
@@ -157,125 +163,116 @@ namespace pdfi
 
 // Does this device use upside-down coordinates?
 // (Upside-down means (0,0) is the top left corner of the page.)
-virtual GBool upsideDown() { return gTrue; }
+virtual GBool upsideDown() SAL_OVERRIDE { return gTrue; }
 
 // Does this device use drawChar() or drawString()?
-virtual GBool useDrawChar() { return gTrue; }
+virtual GBool useDrawChar() SAL_OVERRIDE { return gTrue; }
 
 // Does this device use beginType3Char/endType3Char?  Otherwise,
 // text in Type 3 fonts will be drawn with drawChar/drawString.
-virtual GBool interpretType3Chars() { return gFalse; }
+virtual GBool interpretType3Chars() SAL_OVERRIDE { return gFalse; }
 
 // Does this device need non-text content?
-virtual GBool needNonText() { return gTrue; }
+virtual GBool needNonText() SAL_OVERRIDE { return gTrue; }
 
 //- i

[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/3692

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/92/3692/1

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

It opens every pdf after being exported .

Change-Id: Ie055b3ee2041457dd4b1db6cd7fe04b62764ec6f
---
M filter/source/pdf/pdffilter.cxx
1 file changed, 9 insertions(+), 1 deletion(-)



diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx
index 9aadfed..5abc38d 100644
--- a/filter/source/pdf/pdffilter.cxx
+++ b/filter/source/pdf/pdffilter.cxx
@@ -24,6 +24,10 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+
+using namespace css::system;
 
 // -
 // - 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 == "InteractionHandler" )
 pValue[i].Value >>= xIH;
+else if ( pValue[ i ].Name == "URL" )
+pValue[ i ].Value >>= aUrl;
 }
 
 /* we don't get FilterData if we are exporting directly
@@ -132,7 +139,8 @@
 }
 }
 }
-
+Reference 
xSystemShellExecute(SystemShellExecute::create( 
::comphelper::getProcessComponentContext() ) ); //Open the newly exported pdf
+xSystemShellExecute->execute(aUrl, "", SystemShellExecuteFlags::URIS_ONLY 
);
 return bRet;
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie055b3ee2041457dd4b1db6cd7fe04b62764ec6f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Anurag Kanungo 

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

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

[Muthu Subramanian]

 chart2/source/view/axes/VCartesianAxis.cxx |   28 ++--
 1 file changed, 22 insertions(+), 6 deletions(-)

New commits:
commit 64ed03c90e60be212653b7ed351374ea006f9f57
Author: Muthu Subramanian 
Date:   Tue Apr 30 10:14:54 2013 +0530

n#816939: Improved label overlap detection.

diff --git a/chart2/source/view/axes/VCartesianAxis.cxx 
b/chart2/source/view/axes/VCartesianAxis.cxx
index 3361743..62097105 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -43,6 +43,11 @@
 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 //.
 namespace chart
@@ -53,6 +58,8 @@ using namespace ::com::sun::star::chart2;
 using namespace ::rtl::math;
 using ::basegfx::B2DVector;
 using ::com::sun::star::uno::Reference;
+using ::basegfx::B2DPolygon;
+using ::basegfx::B2DPolyPolygon;
 
 //-
 //-
@@ -138,14 +145,22 @@ bool doesOverlap( const Reference< drawing::XShape >& 
xShape1
 if( !xShape1.is() || !xShape2.is() )
 return false;
 
-sal_Int32 nAngle = abs(fRotationAngleDegree);
+::basegfx::B2DRectangle aRect1( BaseGFXHelper::makeRectangle( 
xShape1->getPosition(), ShapeFactory::getSizeAfterRotation( xShape1, 0 ) ));
+::basegfx::B2DRectangle aRect2( BaseGFXHelper::makeRectangle( 
xShape2->getPosition(), ShapeFactory::getSizeAfterRotation( xShape2, 0 ) ));
 
-if( ( nAngle >= 45 && nAngle <= 135 ) || ( nAngle >= 225 && nAngle <= 315 
) )
-return false;
+B2DPolygon aPoly1 = basegfx::tools::createPolygonFromRect( aRect1 );
+B2DPolygon aPoly2 = basegfx::tools::createPolygonFromRect( aRect2 );
+::basegfx::B2DHomMatrix aMatrix;
+aMatrix.rotate( fRotationAngleDegree );
+aPoly1.transform( aMatrix );
+aPoly2.transform( aMatrix );
+
+B2DPolyPolygon aPolyPoly1, aPolyPoly2;
+aPolyPoly1.append( aPoly1 );
+aPolyPoly2.append( aPoly2 );
+B2DPolyPolygon overlapPoly = 
::basegfx::tools::clipPolyPolygonOnPolyPolygon( aPolyPoly1, aPolyPoly2, true, 
false );
 
-::basegfx::B2IRectangle aRect1( 
BaseGFXHelper::makeRectangle(xShape1->getPosition(),ShapeFactory::getSizeAfterRotation(
 xShape1, fRotationAngleDegree )));
-::basegfx::B2IRectangle aRect2( 
BaseGFXHelper::makeRectangle(xShape2->getPosition(),ShapeFactory::getSizeAfterRotation(
 xShape2, fRotationAngleDegree )));
-return aRect1.overlaps(aRect2);
+return (overlapPoly.count() > 0);
 }
 
 void removeShapesAtWrongRhythm( TickIter& rIter
@@ -787,6 +802,7 @@ bool VCartesianAxis::createTextShapes(
 {
 rAxisLabelProperties.fRotationAngleDegree = 45;
 rAxisLabelProperties.bLineBreakAllowed = false;
+rAxisLabelProperties.eStaggering = SIDE_BY_SIDE;
 m_aAxisLabelProperties.fRotationAngleDegree = 
rAxisLabelProperties.fRotationAngleDegree;
 removeTextShapesFromTicks();
 return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: LibreOffice is one or several applications?

[V Stuart Foote]

Jesús,

Rather than default SHAddtoRecentDocs calls, would it make any sense to
implement the launchers as a custom list using ICustomDestinationList
methods?

http://msdn.microsoft.com/en-us/library/dd378402%28VS.85%29.aspx

You could then implement any custom actions to the lists that would make
sense, rather than just the default "Recent" and "Frequent" of pinned Jump
lists.  For example,  I think Mozilla does this as evident in recent
addition of a  "New Private Window" to FireFox 20.1 Jump list.

Or would that potentially  be moving the Windows code too far from the
internal handling of recent documents in core via the LibreOffice registry?
And end up too risky for long term maintenance?



--
View this message in context: 
http://nabble.documentfoundation.org/LibreOffice-is-one-or-several-applications-tp4052701p4052917.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Kohei Yoshida]

 sc/source/core/data/formulacell.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit b1e2e5973f7fe2da67213599c060574dfb661ae9
Author: Kohei Yoshida 
Date:   Mon Apr 29 19:27:41 2013 -0400

We don't need this code.

Change-Id: I7be5869672be17faefd369d03f69cac5ed2d03b6

diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 7e85225..7158b69 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3132,8 +3132,6 @@ bool ScFormulaCell::InterpretFormulaGroup()
 
 ScCompiler aComp(pDocument, aPos, aCode2);
 aComp.SetGrammar(pDocument->GetGrammar());
-OUStringBuffer aBuf;
-aComp.CreateStringFromTokenArray(aBuf);
 aComp.CompileTokenArray(); // Create RPN token array.
 ScInterpreter aInterpreter(pDest, pDocument, aTmpPos, aCode2);
 aInterpreter.Interpret();
___
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' - formula/source include/formula sc/source

[Kohei Yoshida]

 formula/source/core/api/vectortoken.cxx |   34 +-
 include/formula/vectortoken.hxx |   17 -
 sc/source/core/data/formulacell.cxx |   41 ++--
 3 files changed, 72 insertions(+), 20 deletions(-)

New commits:
commit 2226d5128d7691913485fed9ba917b07275079ce
Author: Kohei Yoshida 
Date:   Mon Apr 29 19:19:48 2013 -0400

Handle range references for group calculation. This is still untested.

Change-Id: I1eb1c217db66615028faa85720838579056dc150

diff --git a/formula/source/core/api/vectortoken.cxx 
b/formula/source/core/api/vectortoken.cxx
index e016fd3..74339397 100644
--- a/formula/source/core/api/vectortoken.cxx
+++ b/formula/source/core/api/vectortoken.cxx
@@ -12,11 +12,11 @@
 namespace formula {
 
 SingleVectorRefToken::SingleVectorRefToken( const double* pArray, size_t 
nLength ) :
-FormulaToken(svSingleVectorRef, ocPush), mpArray(pArray), 
mnLength(nLength) {}
+FormulaToken(svSingleVectorRef, ocPush), mpArray(pArray), 
mnArrayLength(nLength) {}
 
 FormulaToken* SingleVectorRefToken::Clone() const
 {
-return new SingleVectorRefToken(mpArray, mnLength);
+return new SingleVectorRefToken(mpArray, mnArrayLength);
 }
 
 const double* SingleVectorRefToken::GetArray() const
@@ -24,19 +24,19 @@ const double* SingleVectorRefToken::GetArray() const
 return mpArray;
 }
 
-size_t SingleVectorRefToken::GetLength() const
+size_t SingleVectorRefToken::GetArrayLength() const
 {
-return mnLength;
+return mnArrayLength;
 }
 
 DoubleVectorRefToken::DoubleVectorRefToken(
-const std::vector& rArrays, size_t nRowSize, bool 
bAbsStart, bool bAbsEnd ) :
+const std::vector& rArrays, size_t nArrayLength, size_t 
nRefRowSize, bool bStartFixed, bool bEndFixed ) :
 FormulaToken(svDoubleVectorRef, ocPush),
-maArrays(rArrays), mnRowSize(nRowSize), mbAbsStart(bAbsStart), 
mbAbsEnd(bAbsEnd) {}
+maArrays(rArrays), mnArrayLength(nArrayLength), mnRefRowSize(nRefRowSize), 
mbStartFixed(bStartFixed), mbEndFixed(bEndFixed) {}
 
 FormulaToken* DoubleVectorRefToken::Clone() const
 {
-return new DoubleVectorRefToken(maArrays, mnRowSize, mbAbsStart, mbAbsEnd);
+return new DoubleVectorRefToken(maArrays, mnArrayLength, mnRefRowSize, 
mbStartFixed, mbEndFixed);
 }
 
 const std::vector& DoubleVectorRefToken::GetArrays() const
@@ -44,6 +44,26 @@ const std::vector& 
DoubleVectorRefToken::GetArrays() const
 return maArrays;
 }
 
+size_t DoubleVectorRefToken::GetArrayLength() const
+{
+return mnArrayLength;
+}
+
+size_t DoubleVectorRefToken::GetRefRowSize() const
+{
+return mnRefRowSize;
+}
+
+bool DoubleVectorRefToken::IsStartFixed() const
+{
+return mbStartFixed;
+}
+
+bool DoubleVectorRefToken::IsEndFixed() const
+{
+return mbEndFixed;
+}
+
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/formula/vectortoken.hxx b/include/formula/vectortoken.hxx
index db44355..2679b4e 100644
--- a/include/formula/vectortoken.hxx
+++ b/include/formula/vectortoken.hxx
@@ -17,7 +17,7 @@ namespace formula {
 class FORMULA_DLLPUBLIC SingleVectorRefToken : public FormulaToken
 {
 const double* mpArray;
-size_t mnLength;
+size_t mnArrayLength;
 
 public:
 SingleVectorRefToken( const double* pArray, size_t nLength );
@@ -25,7 +25,7 @@ public:
 virtual FormulaToken* Clone() const;
 
 const double* GetArray() const;
-size_t GetLength() const;
+size_t GetArrayLength() const;
 };
 
 /**
@@ -36,18 +36,23 @@ class FORMULA_DLLPUBLIC DoubleVectorRefToken : public 
FormulaToken
 {
 std::vector maArrays;
 
-size_t mnRowSize;
+size_t mnArrayLength;
+size_t mnRefRowSize;
 
-bool mbAbsStart:1; /// whether or not the start row position is absolute.
-bool mbAbsEnd:1; /// whether or not the end row position is absolute.
+bool mbStartFixed:1; /// whether or not the start row position is absolute.
+bool mbEndFixed:1; /// whether or not the end row position is absolute.
 
 public:
 DoubleVectorRefToken(
-const std::vector& rArrays, size_t nRowSize, bool 
bAbsStart, bool bAbsEnd );
+const std::vector& rArrays, size_t nArrayLength, size_t 
nRefRowSize, bool bStartFixed, bool bEndFixed );
 
 virtual FormulaToken* Clone() const;
 
 const std::vector& GetArrays() const;
+size_t GetArrayLength() const;
+size_t GetRefRowSize() const;
+bool IsStartFixed() const;
+bool IsEndFixed() const;
 };
 
 }
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 5987253..7e85225 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3030,24 +3030,25 @@ bool ScFormulaCell::InterpretFormulaGroup()
 size_t nCols = aRef.Ref2.nCol - aRef.Ref1.nCol + 1;
 std::vector aArrays;
 aArrays.reserve(nCols);
-SCROW nLength = xGroup->mnLength;
+SCROW nArrayLe

[PATCH] export zoom factor correctly to OOXML

[Markus Mohrhard (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3691

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/91/3691/1

export zoom factor correctly to OOXML

Change-Id: I6ab21e46e63a4d1597eb79de91533448fef0cfbc
---
M sc/source/filter/excel/xeview.cxx
1 file changed, 3 insertions(+), 0 deletions(-)



diff --git a/sc/source/filter/excel/xeview.cxx 
b/sc/source/filter/excel/xeview.cxx
index 37d4090..6c8b5e74 100644
--- a/sc/source/filter/excel/xeview.cxx
+++ b/sc/source/filter/excel/xeview.cxx
@@ -282,6 +282,9 @@
 /** Converts a Calc zoom factor into an Excel zoom factor. Returns 0 for a 
default zoom value. */
 sal_uInt16 lclGetXclZoom( long nScZoom, sal_uInt16 nDefXclZoom )
 {
+if(!nScZoom)
+return 0;
+
 sal_uInt16 nXclZoom = limit_cast< sal_uInt16 >( nScZoom, EXC_ZOOM_MIN, 
EXC_ZOOM_MAX );
 return (nXclZoom == nDefXclZoom) ? 0 : nXclZoom;
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ab21e46e63a4d1597eb79de91533448fef0cfbc
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Markus Mohrhard 

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

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

[Thorsten Behrens]

 sdext/Executable_pdf2xml.mk |2 +
 sdext/Executable_pdfunzip.mk|4 ---
 sdext/source/pdfimport/test/pdf2xml.cxx |   38 +---
 sdext/source/pdfimport/test/tests.cxx   |6 -
 4 files changed, 18 insertions(+), 32 deletions(-)

New commits:
commit 298c52a61d7c70c1f0fd042767ac9dfad52af175
Author: Thorsten Behrens 
Date:   Tue Apr 30 00:34:49 2013 +0200

pdfunzip rather needs ~no office libraries.

Change-Id: I27df97ab6e35b03dfe70c7a979dd06f977086069

diff --git a/sdext/Executable_pdfunzip.mk b/sdext/Executable_pdfunzip.mk
index 2f20685..ec94503 100644
--- a/sdext/Executable_pdfunzip.mk
+++ b/sdext/Executable_pdfunzip.mk
@@ -22,10 +22,6 @@ $(eval $(call gb_Executable_set_include,pdfunzip,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,pdfunzip,\
-basegfx \
-vcl \
-cppu \
-cppuhelper \
 sal \
 ))
 
commit b0da8f00a0d41f2b17639fcee4ed4956421e55c5
Author: Thorsten Behrens 
Date:   Tue Apr 30 00:33:23 2013 +0200

Make pdf2xml usable at least from within buildenv again.

Seems this had bitrotted quite a lot. Calling it now like a cppunit
test works again.

Change-Id: I27479c3c3e1c1fe0639629e9bf8844456e0b0515

diff --git a/sdext/Executable_pdf2xml.mk b/sdext/Executable_pdf2xml.mk
index 6cd93a0..38a591d 100644
--- a/sdext/Executable_pdf2xml.mk
+++ b/sdext/Executable_pdf2xml.mk
@@ -26,6 +26,8 @@ $(eval $(call gb_Executable_use_libraries,pdf2xml,\
 vcl \
 comphelper \
 cppu \
+unotest \
+test \
 cppuhelper \
 sal \
 ))
diff --git a/sdext/source/pdfimport/test/pdf2xml.cxx 
b/sdext/source/pdfimport/test/pdf2xml.cxx
index d18bfa0..666781b 100644
--- a/sdext/source/pdfimport/test/pdf2xml.cxx
+++ b/sdext/source/pdfimport/test/pdf2xml.cxx
@@ -27,17 +27,16 @@
 
 #include 
 #include 
-#include 
-
-#include 
+#include 
 #include 
+#include 
 
 using namespace ::pdfi;
 using namespace ::com::sun::star;
 
 SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 {
-if( argc != 5 )
+if( argc < 4 )
 return 1;
 
 OUString aBaseURL, aTmpURL, aSrcURL, aDstURL, aIniUrl;
@@ -61,32 +60,17 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
   &aTmpURL.pData );
 osl_getAbsoluteFileURL(aBaseURL.pData,aTmpURL.pData,&aDstURL.pData);
 
-osl_getFileURLFromSystemPath( OUString::createFromAscii(argv[4]).pData,
-&aTmpURL.pData );
-osl_getAbsoluteFileURL(aBaseURL.pData,aTmpURL.pData,&aIniUrl.pData);
-
 // bootstrap UNO
-uno::Reference< lang::XMultiServiceFactory > xFactory;
-uno::Reference< uno::XComponentContext > xCtx;
-try
-{
-xCtx = ::cppu::defaultBootstrap_InitialComponentContext(aIniUrl);
-xFactory = uno::Reference< lang::XMultiServiceFactory >(  
xCtx->getServiceManager(),
-  
uno::UNO_QUERY );
-if( xFactory.is() )
-::comphelper::setProcessServiceFactory( xFactory );
-}
-catch( uno::Exception& )
-{
-}
+uno::Reference< uno::XComponentContext > xContext(
+cppu::defaultBootstrap_InitialComponentContext() );
+uno::Reference 
xFactory(xContext->getServiceManager());
+uno::Reference xSM(xFactory, 
uno::UNO_QUERY_THROW);
+comphelper::setProcessServiceFactory(xSM);
 
-if( !xFactory.is() )
-{
-OSL_TRACE( "Could not bootstrap UNO, installation must be in disorder. 
Exiting." );
-return 1;
-}
+test::BootstrapFixtureBase aEnv;
+aEnv.setUp();
 
-pdfi::PDFIRawAdaptor aAdaptor( xCtx );
+pdfi::PDFIRawAdaptor aAdaptor( aEnv.getComponentContext() );
 aAdaptor.setTreeVisitorFactory(pTreeFactory);
 aAdaptor.odfConvert( aSrcURL, new OutputWrap(aDstURL), NULL );
 
commit bfffa6d7cee18d0814bc38f1d053a0d0b27f972c
Author: Thorsten Behrens 
Date:   Tue Apr 30 00:31:58 2013 +0200

Add unit test for pdfimport image import.

Change-Id: Ifd51f0c25418085ba8a6e8d331ac5c6d8139d18a

diff --git a/sdext/source/pdfimport/test/tests.cxx 
b/sdext/source/pdfimport/test/tests.cxx
index ec36810..a90010f 100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -82,7 +82,8 @@ namespace
 m_bPageEnded(false),
 m_bRedCircleSeen(false),
 m_bGreenStrokeSeen(false),
-m_bDashedLineSeen(false)
+m_bDashedLineSeen(false),
+m_bImageSeen(false)
 {}
 
 ~TestSink()
@@ -111,6 +112,7 @@ namespace
 CPPUNIT_ASSERT_MESSAGE( "red circle seen in input", 
m_bRedCircleSeen );
 CPPUNIT_ASSERT_MESSAGE( "green stroke seen in input", 
m_bGreenStrokeSeen );
 CPPUNIT_ASSERT_MESSAGE( "dashed line seen in input", 
m_bDashedLineSeen );
+CPPUNIT_ASSERT_MESSAGE( "image seen in input", m_bImageSeen );
 }
 
 private:
@@ -377,6 +379,7 @@ namespace
 xBitmap[0].

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

[Markus Mohrhard]

 include/oox/export/chartexport.hxx |   14 ---
 oox/source/core/xmlfilterbase.cxx  |7 +
 oox/source/export/chartexport.cxx  |   44 -
 3 files changed, 3 insertions(+), 62 deletions(-)

New commits:
commit dd24f18545d1e041b2dc427ce4d6c28fbd39d76d
Author: Markus Mohrhard 
Date:   Tue Apr 30 00:06:54 2013 +0200

now ooxml files are accepted by Excel again

Yes, a simple test would have answered the question in the comment and
made clear that nanoseconds are not accepted by MSO.

Let's go with normal seconds as MSO does. It seems it also accepts
1/100s but who really needs that for a file timestamp.

Change-Id: Iaec6f9c08dc94d5086b83cb4bf520d0053b71b28

diff --git a/oox/source/core/xmlfilterbase.cxx 
b/oox/source/core/xmlfilterbase.cxx
index 4cd7665..fe2055e 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -482,12 +482,9 @@ writeElement( FSHelperPtr pDoc, sal_Int32 nXmlElement, 
const util::DateTime& rTi
 FSEND );
 
 char pStr[200];
-// FIXME: my guess is that precision greater than millisecond in 
undesirable
-//(forbidden by the standard???)
-snprintf( pStr, sizeof( pStr ), "%d-%02d-%02dT%02d:%02d:%02d.%09" 
SAL_PRIuUINT32 "Z",
+snprintf( pStr, sizeof( pStr ), "%d-%02d-%02dT%02d:%02d:%02dZ",
 rTime.Year, rTime.Month, rTime.Day,
-rTime.Hours, rTime.Minutes, rTime.Seconds,
-rTime.NanoSeconds);
+rTime.Hours, rTime.Minutes, rTime.Seconds );
 
 pDoc->write( pStr );
 
commit f9cd73ebe116cd95247aff1963e2f5b4ec671dfa
Author: Markus Mohrhard 
Date:   Mon Apr 29 20:57:10 2013 +0200

remove a few more unused variables

Change-Id: I6c70c000f60e7e6e43bd068ccb98b693b80746f2

diff --git a/include/oox/export/chartexport.hxx 
b/include/oox/export/chartexport.hxx
index 214c08f..d3212d0 100644
--- a/include/oox/export/chartexport.hxx
+++ b/include/oox/export/chartexport.hxx
@@ -89,11 +89,8 @@ private:
 com::sun::star::uno::Reference< com::sun::star::chart2::XDiagram > 
mxNewDiagram;
 
 // members filled by InitRangeSegmentationProperties (retrieved from 
DataProvider)
-sal_Bool mbHasSeriesLabels;
 sal_Bool mbHasCategoryLabels; //if the categories are only automatically 
generated this will be false
-sal_Bool mbRowSourceColumns;
 OUString msChartAddress;
-OUString msTableNumberList;
 ::com::sun::star::uno::Sequence< sal_Int32 > maSequenceMapping;
 
 //::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > 
mxAdditionalShapes;
diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index 98fff6f..48e2e60 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -438,14 +438,8 @@ ChartExport::ChartExport( sal_Int32 nXmlNamespace, 
FSHelperPtr pFS, Reference< f
 , mnXmlNamespace( nXmlNamespace )
 , maFraction( 1, 576 )
 , mxChartModel( xModel )
-, mbHasSeriesLabels( sal_False )
 , mbHasCategoryLabels( sal_False )
-, mbRowSourceColumns( sal_True )
-, mbHasXAxis( sal_False )
-, mbHasYAxis( sal_False )
 , mbHasZAxis( sal_False )
-, mbHasSecondaryXAxis( sal_False )
-, mbHasSecondaryYAxis( sal_False )
 , mbIs3DChart( sal_False )
 {
 }
@@ -631,18 +625,8 @@ void ChartExport::InitRangeSegmentationProperties( const 
Reference< chart2::XCha
 if( aArgs[i].Value >>= sBrokenRange )
 bBrokenRangeAvailable = true;
 }
-else if ( aArgs[i].Name == "DataRowSource" )
-{
-::com::sun::star::chart::ChartDataRowSource eRowSource;
-aArgs[i].Value >>= eRowSource;
-mbRowSourceColumns = ( eRowSource == 
::com::sun::star::chart::ChartDataRowSource_COLUMNS );
-}
-else if ( aArgs[i].Name == "FirstCellAsLabel" )
-aArgs[i].Value >>= mbHasSeriesLabels;
 else if ( aArgs[i].Name == "SequenceMapping" )
 aArgs[i].Value >>= maSequenceMapping;
-else if ( aArgs[i].Name == "TableNumberList" )
-aArgs[i].Value >>= msTableNumberList;
 }
 
 // #i79009# For Writer we have to export a broken version of 
the
@@ -720,10 +704,6 @@ void ChartExport::_ExportContent()
 aAny >>= msChartAddress;
 //maExportHelper.SetChartRangeAddress( 
sChartAddress );
 
-// OUString sTableNumberList;
-aAny = xProp->getPropertyValue(
-OUString("TableNumberList"));
-aAny >>= msTableNumberList;
 //maExportHelper.SetTableNumberList( 
sTableNumberList );
 
   

[PATCH libreoffice-4-0] Fix import of images from pdf.

[Thorsten Behrens (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3690

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/90/3690/1

Fix import of images from pdf.

Seems poppler changed outputdev virt func signatures with version
12, so with system poppler, we never got any image import functions
called. Added override annotation to prevent this from happening in
the future.

Change-Id: I565de80ce218e831e276d3a1d88ded3baee876e7
---
M sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
M sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
2 files changed, 89 insertions(+), 72 deletions(-)



diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 765d0be..03adf89 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -836,6 +836,9 @@
 
 void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str,
   int width, int height, GBool invert,
+#if POPPLER_CHECK_VERSION(0, 12, 0)
+  GBool /*interpolate*/,
+#endif
   GBool /*inlineImg*/ )
 {
 OutputBuffer aBuf; initBuf(aBuf);
@@ -862,6 +865,9 @@
 
 void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
   int width, int height, GfxImageColorMap* colorMap,
+#if POPPLER_CHECK_VERSION(0, 12, 0)
+  GBool /*interpolate*/,
+#endif
   int* maskColors, GBool /*inlineImg*/ )
 {
 OutputBuffer aBuf; initBuf(aBuf);
@@ -908,9 +914,16 @@
 void PDFOutDev::drawMaskedImage(GfxState*, Object*, Stream* str,
 int width, int height,
 GfxImageColorMap* colorMap,
+#if POPPLER_CHECK_VERSION(0, 12, 0)
+GBool /*interpolate*/,
+#endif
 Stream* maskStr,
 int maskWidth, int maskHeight,
-GBool maskInvert)
+GBool maskInvert
+#if POPPLER_CHECK_VERSION(0, 12, 0)
+, GBool /*maskInterpolate*/
+#endif
+   )
 {
 OutputBuffer aBuf; initBuf(aBuf);
 printf( "drawImage %d %d 0", width, height );
@@ -921,9 +934,16 @@
 void PDFOutDev::drawSoftMaskedImage(GfxState*, Object*, Stream* str,
 int width, int height,
 GfxImageColorMap* colorMap,
+#if POPPLER_CHECK_VERSION(0, 12, 0)
+GBool /*interpolate*/,
+#endif
 Stream* maskStr,
 int maskWidth, int maskHeight,
-GfxImageColorMap* maskColorMap )
+GfxImageColorMap* maskColorMap
+#if POPPLER_CHECK_VERSION(0, 12, 0)
+, GBool /*maskInterpolate*/
+#endif
+   )
 {
 OutputBuffer aBuf; initBuf(aBuf);
 printf( "drawImage %d %d 0", width, height );
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index e5e48fc..c0977cb7 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -46,6 +46,12 @@
 #pragma warning(pop)
 #endif
 
+#if HAVE_CXX11_OVERRIDE
+#define SAL_OVERRIDE override
+#else
+#define SAL_OVERRIDE
+#endif
+
 #include 
 #include 
 
@@ -157,125 +163,116 @@
 
 // Does this device use upside-down coordinates?
 // (Upside-down means (0,0) is the top left corner of the page.)
-virtual GBool upsideDown() { return gTrue; }
+virtual GBool upsideDown() SAL_OVERRIDE { return gTrue; }
 
 // Does this device use drawChar() or drawString()?
-virtual GBool useDrawChar() { return gTrue; }
+virtual GBool useDrawChar() SAL_OVERRIDE { return gTrue; }
 
 // Does this device use beginType3Char/endType3Char?  Otherwise,
 // text in Type 3 fonts will be drawn with drawChar/drawString.
-virtual GBool interpretType3Chars() { return gFalse; }
+virtual GBool interpretType3Chars() SAL_OVERRIDE { return gFalse; }
 
 // Does this device need non-text content?
-virtual GBool needNonText() { return gTrue; }
+virtual GBool needNonText() SAL_OVERRIDE { return gTrue; }
 
 //- initialization and control
 
 // Set default transform matrix.
-virtual void setDefaultCTM(double *ctm);
+virtual void setDefaultCTM(double *ctm) SAL_OVERRIDE;
 
 // Start a page.
-virtual void startPage(int pageNum, GfxState *state);
+virtual void startPage(int pageNum, GfxState *state) SAL_OVERRIDE;
 
 // End a p

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

[Thorsten Behrens]

 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |   24 ++-
 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |  137 --
 2 files changed, 89 insertions(+), 72 deletions(-)

New commits:
commit 0bb97f5656ef5b01b6e1b97e25e33622a44d4d34
Author: Thorsten Behrens 
Date:   Tue Apr 30 00:05:18 2013 +0200

Fix import of images from pdf.

Seems poppler changed outputdev virt func signatures with version
12, so with system poppler, we never got any image import functions
called. Added override annotation to prevent this from happening in
the future.

Change-Id: I565de80ce218e831e276d3a1d88ded3baee876e7

diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 765d0be..03adf89 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -836,6 +836,9 @@ void PDFOutDev::endTextObject(GfxState*)
 
 void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str,
   int width, int height, GBool invert,
+#if POPPLER_CHECK_VERSION(0, 12, 0)
+  GBool /*interpolate*/,
+#endif
   GBool /*inlineImg*/ )
 {
 OutputBuffer aBuf; initBuf(aBuf);
@@ -862,6 +865,9 @@ void PDFOutDev::drawImageMask(GfxState* pState, Object*, 
Stream* str,
 
 void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
   int width, int height, GfxImageColorMap* colorMap,
+#if POPPLER_CHECK_VERSION(0, 12, 0)
+  GBool /*interpolate*/,
+#endif
   int* maskColors, GBool /*inlineImg*/ )
 {
 OutputBuffer aBuf; initBuf(aBuf);
@@ -908,9 +914,16 @@ void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
 void PDFOutDev::drawMaskedImage(GfxState*, Object*, Stream* str,
 int width, int height,
 GfxImageColorMap* colorMap,
+#if POPPLER_CHECK_VERSION(0, 12, 0)
+GBool /*interpolate*/,
+#endif
 Stream* maskStr,
 int maskWidth, int maskHeight,
-GBool maskInvert)
+GBool maskInvert
+#if POPPLER_CHECK_VERSION(0, 12, 0)
+, GBool /*maskInterpolate*/
+#endif
+   )
 {
 OutputBuffer aBuf; initBuf(aBuf);
 printf( "drawImage %d %d 0", width, height );
@@ -921,9 +934,16 @@ void PDFOutDev::drawMaskedImage(GfxState*, Object*, 
Stream* str,
 void PDFOutDev::drawSoftMaskedImage(GfxState*, Object*, Stream* str,
 int width, int height,
 GfxImageColorMap* colorMap,
+#if POPPLER_CHECK_VERSION(0, 12, 0)
+GBool /*interpolate*/,
+#endif
 Stream* maskStr,
 int maskWidth, int maskHeight,
-GfxImageColorMap* maskColorMap )
+GfxImageColorMap* maskColorMap
+#if POPPLER_CHECK_VERSION(0, 12, 0)
+, GBool /*maskInterpolate*/
+#endif
+   )
 {
 OutputBuffer aBuf; initBuf(aBuf);
 printf( "drawImage %d %d 0", width, height );
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index e5e48fc..c0977cb7 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -46,6 +46,12 @@
 #pragma warning(pop)
 #endif
 
+#if HAVE_CXX11_OVERRIDE
+#define SAL_OVERRIDE override
+#else
+#define SAL_OVERRIDE
+#endif
+
 #include 
 #include 
 
@@ -157,125 +163,116 @@ namespace pdfi
 
 // Does this device use upside-down coordinates?
 // (Upside-down means (0,0) is the top left corner of the page.)
-virtual GBool upsideDown() { return gTrue; }
+virtual GBool upsideDown() SAL_OVERRIDE { return gTrue; }
 
 // Does this device use drawChar() or drawString()?
-virtual GBool useDrawChar() { return gTrue; }
+virtual GBool useDrawChar() SAL_OVERRIDE { return gTrue; }
 
 // Does this device use beginType3Char/endType3Char?  Otherwise,
 // text in Type 3 fonts will be drawn with drawChar/drawString.
-virtual GBool interpretType3Chars() { return gFalse; }
+virtual GBool interpretType3Chars() SAL_OVERRIDE { return gFalse; }
 
 // Does this device need non-text content?
-virtual GBool needNonText() { return gTrue; }
+virtual GBool needNonText() SAL_OVERRIDE { return gTrue; }
 
 //- initialization and control
 
 // Set default transform matrix.
-virtual void setDefaultCTM(double *c

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

[Thorsten Behrens]

 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |   24 ++-
 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |  137 --
 2 files changed, 89 insertions(+), 72 deletions(-)

New commits:
commit 6b18d7d28efb0285f01e36f5b0cb2cddb1c68488
Author: Thorsten Behrens 
Date:   Tue Apr 30 00:05:18 2013 +0200

Fix import of images from pdf.

Seems poppler changed outputdev virt func signatures with version
12, so with system poppler, we never got any image import functions
called. Added override annotation to prevent this from happening in
the future.

Change-Id: I565de80ce218e831e276d3a1d88ded3baee876e7

diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index b556486..4ee6a59 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -846,6 +846,9 @@ void PDFOutDev::endTextObject(GfxState*)
 
 void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str,
   int width, int height, GBool invert,
+#if POPPLER_CHECK_VERSION(0, 12, 0)
+  GBool /*interpolate*/,
+#endif
   GBool /*inlineImg*/ )
 {
 OutputBuffer aBuf; initBuf(aBuf);
@@ -872,6 +875,9 @@ void PDFOutDev::drawImageMask(GfxState* pState, Object*, 
Stream* str,
 
 void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
   int width, int height, GfxImageColorMap* colorMap,
+#if POPPLER_CHECK_VERSION(0, 12, 0)
+  GBool /*interpolate*/,
+#endif
   int* maskColors, GBool /*inlineImg*/ )
 {
 OutputBuffer aBuf; initBuf(aBuf);
@@ -918,9 +924,16 @@ void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
 void PDFOutDev::drawMaskedImage(GfxState*, Object*, Stream* str,
 int width, int height,
 GfxImageColorMap* colorMap,
+#if POPPLER_CHECK_VERSION(0, 12, 0)
+GBool /*interpolate*/,
+#endif
 Stream* maskStr,
 int maskWidth, int maskHeight,
-GBool maskInvert)
+GBool maskInvert
+#if POPPLER_CHECK_VERSION(0, 12, 0)
+, GBool /*maskInterpolate*/
+#endif
+   )
 {
 OutputBuffer aBuf; initBuf(aBuf);
 printf( "drawImage %d %d 0", width, height );
@@ -931,9 +944,16 @@ void PDFOutDev::drawMaskedImage(GfxState*, Object*, 
Stream* str,
 void PDFOutDev::drawSoftMaskedImage(GfxState*, Object*, Stream* str,
 int width, int height,
 GfxImageColorMap* colorMap,
+#if POPPLER_CHECK_VERSION(0, 12, 0)
+GBool /*interpolate*/,
+#endif
 Stream* maskStr,
 int maskWidth, int maskHeight,
-GfxImageColorMap* maskColorMap )
+GfxImageColorMap* maskColorMap
+#if POPPLER_CHECK_VERSION(0, 12, 0)
+, GBool /*maskInterpolate*/
+#endif
+   )
 {
 OutputBuffer aBuf; initBuf(aBuf);
 printf( "drawImage %d %d 0", width, height );
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index c479624..7599adb 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -46,6 +46,12 @@
 #pragma warning(pop)
 #endif
 
+#if HAVE_CXX11_OVERRIDE
+#define SAL_OVERRIDE override
+#else
+#define SAL_OVERRIDE
+#endif
+
 #include 
 #include 
 
@@ -158,125 +164,116 @@ namespace pdfi
 
 // Does this device use upside-down coordinates?
 // (Upside-down means (0,0) is the top left corner of the page.)
-virtual GBool upsideDown() { return gTrue; }
+virtual GBool upsideDown() SAL_OVERRIDE { return gTrue; }
 
 // Does this device use drawChar() or drawString()?
-virtual GBool useDrawChar() { return gTrue; }
+virtual GBool useDrawChar() SAL_OVERRIDE { return gTrue; }
 
 // Does this device use beginType3Char/endType3Char?  Otherwise,
 // text in Type 3 fonts will be drawn with drawChar/drawString.
-virtual GBool interpretType3Chars() { return gFalse; }
+virtual GBool interpretType3Chars() SAL_OVERRIDE { return gFalse; }
 
 // Does this device need non-text content?
-virtual GBool needNonText() { return gTrue; }
+virtual GBool needNonText() SAL_OVERRIDE { return gTrue; }
 
 //- initialization and control
 
 // Set default transform matrix.
-virtual void setDefaultCTM(double *ct

Re: LibreOffice is one or several applications?

[Jesús Corrius]

On Mon, Apr 29, 2013 at 2:10 PM, Stephan Bergmann wrote:

> On 04/29/2013 10:31 AM, Jesús Corrius wrote:
>
>> 2. Change the thread Application User Model ID when launching a new
>> component from inside LibO.
>>
>
> Keeping track of per-thread AppUserModelIDs might be tricky (e.g., for
> remote UNO access), but documentation like  *us/library/windows/desktop/**dd378459%28v=vs.85%29.aspx>
> "Application User Model IDs (AppUserModelIDs)" makes it look like any
> per-process setting is overridden per-window rather than per-thread anyway?
>

I found setting the System.AppUserModel.ID property of the application's
shortcut file not necessary provided that the file types are correctly
mapped in the registry (we already have so) and the launcher sets the
AppUserModelID during startup (I removed the code on Friday but it will be
back soon). If we set different IDs per launcher (as it is currently in
4.0.x), everything seems to work perfectly fine if you launch the documents
by double clicking in the Windows Explorer icon (you have the recent
documents without calling SHAddToRecentDocs and you have a "Jump List" menu
-- I don't like to call it Jump list in the case because it's just the one
provided by Windows, that is we don't really provide one, but i may be a
little bit picky here).

On the other side, if you then open --double click-- a new document
(suppose you open a new spreadsheet and you have a write document already
open) the window grouping doesn't work, although the AppUserModelID is set
correctly by the launcher. Also the icon on the task bar is not the one of
a calc document, but just a plain LibreOffice icon.

So during application startup (i.e launcher) we
call 
SetCurrentProcessExplicitAppUserModelID("TheDocumentFoundation.LibreOffice")
provided that the Shell32.dll version is equal or higher than 6.1. I guess
if we wanted to have "separate applications" we could
call SHGetPropertyStoreForWindow for each different app window and set the
AppUserModelID, for example, to "TheDocumentFoundation.LibreOffice.Writer".
This would make setting a different ID in the launchers unnecessary,
although we could need them there to personalize the Jump List menu.

Also then we should call SHAddToRecentDocs explicitly. But we could do the
trick to not prevent the file dialog to call it, in this way all the
documents would be added to the "TheDocumentFoundation.LibreOffice" one and
also to the "TheDocumentFoundation.LibreOffice.Writer" one. In this way,
the start center, associated only with the main ID could act as a place to
store *all* recent documents, while the writer shortcut could only store
the list of recent writer documents.

-- 
Jesús Corrius 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] fdo#60924: Move more libs to autoinstallation

[Marcos Souza (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3689

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/89/3689/1

fdo#60924: Move more libs to autoinstallation

Change-Id: I5c136760ca59278ba6bfcd1d11c56d810e9cfa76
---
M Repository.mk
M scp2/source/ooo/file_library_ooo.scp
M scp2/source/ooo/module_hidden_ooo.scp
3 files changed, 40 insertions(+), 88 deletions(-)



diff --git a/Repository.mk b/Repository.mk
index 296ffc8..a5a13e0 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -218,8 +218,11 @@
 endif
 
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
+abp \
+analysis \
avmedia \
$(if $(DISABLE_SCRIPTING),,basctl) \
+basegfx \
 bib \
 canvastools \
 chartcore \
@@ -232,6 +235,8 @@
 dbmm \
 $(if $(DISABLE_DBCONNECTIVITY),,dbtools) \
 dbaxml \
+dbp \
+dbu \
deploymentmisc \
$(if $(filter unx,$(GUIBASE)),desktop_detector) \
 drawinglayer \
@@ -246,7 +251,9 @@
 ept \
 era \
 eti \
+evtatt \
 exp \
+flat \
file \
filterconfig \
 for \
@@ -258,6 +265,7 @@
 fwl \
fwm \
 $(if $(filter DESKTOP,$(BUILD_TYPE)),helplinker) \
+hyphen \
 icd \
 icg \
 idx \
@@ -271,14 +279,38 @@
 itg \
 iti \
 lng \
+lnth \
+log \
 $(if $(MERGELIBS),merged) \
 msfilter \
+mysql \
+odbc \
 odbcbase \
+odfflatxml \
+offacc \
+oox \
+pcr \
+pdffilter \
+pricing \
+rpt \
+rptui \
+rptxml \
 sax \
 sb \
 sdbt \
+sc \
+scd \
+scfilt \
+scui \
+scn \
+sd \
+sdd \
 sdfilt \
+sdui \
 sfx \
+sm \
+smd \
+solver \
 sot \
 $(if $(ENABLE_HEADLESS),,spl) \
 svgio \
@@ -286,6 +318,9 @@
 svt \
 svx \
 svxcore \
+sw \
+textconversiondlgs \
+textfd \
 tk \
 tl \
$(if $(ENABLE_TELEPATHY),tubes) \
@@ -295,7 +330,12 @@
 uui \
 vcl \
 xmlscript \
+xmlfa \
+xmlfd \
 xo \
+xof \
+xsltdlg \
+xsltfilter \
 ))
 
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,WRITER, \
@@ -310,80 +350,45 @@
 ))
 
 $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
-abp \
 acc \
adabas \
adabasui \
ado \
 agg \
-analysis \
 animcore \
 $(if $(filter $(OS),ANDROID),, \
basebmp \
 ) \
 communi \
 date \
-evtatt \
-odbc \
-oox \
ooxml \
 sdbc \
 AppleRemote \
 avmediaQuickTime \
-basegfx \
 calc \
-dbp \
-dbu \
 evoab \
filtertracer \
flash \
-   flat \
 graphicfilter \
 guesslang \
-hyphen \
jdbc \
kab1 \
kabdrv1 \
-lnth \
-log \
MacOSXSpell \
 mork \
 mozab2 \
 mozabdrv \
-   mysql \
-odfflatxml \
-offacc \
-pcr \
-pdffilter \
 placeware \
-pricing \
 protocolhandler \
 qstart_gtk \
 res \
-rpt \
-rptui \
-rptxml \
-sc \
-scd \
-scfilt \
-scn \
-scui \
-sd \
-sdd \
-sdui \
 simplecm \
-sm \
-smd \
-solver \
 spa \
 spell \
 sts \
 svgfilter \
-sw \
tdeab1 \
tdeabdrv1 \
-textconversiondlgs \
-textfd \
 updatecheckui \
 $(if $(DISABLE_SCRIPTING),,vbahelper) \
 vclplug_gen \
@@ -394,11 +399,6 @@
 vclplug_kde4 \
 vclplug_svp \
 wpftdraw \
-xmlfa \
-xmlfd \
-xof \
-xsltdlg \
-xsltfilter \
 ))
 
 ifneq (,$(filter ANDROID IOS,$(OS)))
diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index ab3105e..5985728d 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -645,12 +645,7 @@
 
 #endif
 
-STD_LIB_FILE(gid_File_Lib_Mysql,mysql)
-STD_LIB_FILE(gid_File_Lib_Odbc,odbc)
-
 // STD_LIB_FILE( gid_File_Lib_Ofa , ofa)
-
-STD_LIB_FILE( gid_File_Lib_Offacc, offacc)
 
 #ifdef SOLAR_JAVA
 #ifndef MACOSX
@@ -674,12 +669,6 @@
 #endif
 
 STD_LIB_FILE( gid_File_Lib_Passwordcontainer, passwordcontainer )
-
-STD_LIB_FILE( gid_File_Lib_Pcr, pcr)
-
-STD_LIB_FILE( gid_File_Lib_Log, log)
-
-STD_LIB_FILE( gid_File_Lib_Pdffilter, pdffilter)
 
 SPECIAL_LIB_FILE(gid_File_Lib_DeploymentGui,deploymentgui)
 
@@ -977,28 +966,7 @@
 
 STD_LIB_FILE(gid_File_Ucpcmis, ucpcmis1)
 
-File gid_File_Lib_Lnth
-LIB_FILE_BODY;
-Styles = (PACKED);
-Name = LIBNAME(lnth);
-Dir = SCP2_OOO_BIN_DIR;
-End
-
-File gid_File_Lib_Hyph
-LIB_FILE_BODY;
-Styles = (PACKED);
-Name = LIBNAME(hyphen);
-Dir = SCP2_OOO_BIN_DIR;
-End
-
-STD_LIB_FILE( gid_File_Lib_BaseGfx, basegfx )
-STD_LIB_FILE( gid_File_Lib_Xof, xof)
-STD_LIB_FILE( gid_File_Lib_Xsltdlg, xsltdlg )
-STD_LIB_FILE( gid_File_Lib_Xsltfilter, xsltfilter )
-STD_LIB_FILE( gid_File_Lib_Xmlfa, xmlfa )
-

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

[Kohei Yoshida]

 sc/source/core/data/formulacell.cxx |   28 ++--
 1 file changed, 26 insertions(+), 2 deletions(-)

New commits:
commit 2ea9b75327755aca7d5ee66ab25b371e57f8f5ee
Author: Kohei Yoshida 
Date:   Mon Apr 29 17:51:41 2013 -0400

Handle range reference as well for group calculation. Not tested yet.

Change-Id: I3bf58a20f0b8c017862ae23202e4b2272f7c952c

diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index ba039b6..5987253 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3023,8 +3023,32 @@ bool ScFormulaCell::InterpretFormulaGroup()
 aRef.CalcAbsIfRel(aPos);
 if (aRef.Ref1.IsRowRel() || aRef.Ref2.IsRowRel())
 {
-// TODO: Implement this.
-return false;
+// Row reference is relative.
+bool bAbsFirst = !aRef.Ref1.IsRowRel();
+bool bAbsLast = !aRef.Ref2.IsRowRel();
+ScAddress aRefPos(aRef.Ref1.nCol, aRef.Ref1.nRow, 
aRef.Ref1.nTab);
+size_t nCols = aRef.Ref2.nCol - aRef.Ref1.nCol + 1;
+std::vector aArrays;
+aArrays.reserve(nCols);
+SCROW nLength = xGroup->mnLength;
+if (!bAbsLast)
+{
+// range end position is relative. Extend it.
+nLength += aRef.Ref2.nRow - aRef.Ref1.nRow;
+}
+
+for (SCCOL i = aRef.Ref1.nCol; i <= aRef.Ref2.nCol; ++i)
+{
+aRefPos.SetCol(i);
+const double* pArray = 
pDocument->FetchDoubleArray(aCxt, aRefPos, nLength);
+if (!pArray)
+return false;
+
+aArrays.push_back(pArray);
+}
+
+formula::DoubleVectorRefToken aTok(aArrays, nLength, 
bAbsFirst, bAbsLast);
+aCode.AddToken(aTok);
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: fdo#55814: unit test is missing

[David Ostrovsky]

On 29.04.2013 09:41, Stephan Bergmann wrote:
Is it really working on all platforms, incl. Windows?  If yes, why is 
sw/Module_sw.mk still



ifneq ($(DISABLE_PYTHON),TRUE)
ifneq ($(OS),WNT)
$(eval $(call gb_Module_add_subsequentcheck_targets,sw,\
PythonTest_sw_python \
))
endif
endif

good catch, can not verify it: cli_ure is failing to compile here atm.

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

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

[Kohei Yoshida]

 formula/source/core/api/vectortoken.cxx |   20 +++-
 include/formula/vectortoken.hxx |   17 ++---
 sc/source/core/data/formulacell.cxx |4 ++--
 3 files changed, 19 insertions(+), 22 deletions(-)

New commits:
commit 7b7f0ae1417ea9acade4c45d6500c5ec3530aed4
Author: Kohei Yoshida 
Date:   Mon Apr 29 17:30:23 2013 -0400

Let's not use VectorArray struct. There is no use for it.

Change-Id: Ic011143206c13fcbc1b3403bf5b7df46c6934899

diff --git a/formula/source/core/api/vectortoken.cxx 
b/formula/source/core/api/vectortoken.cxx
index 94a071c..e016fd3 100644
--- a/formula/source/core/api/vectortoken.cxx
+++ b/formula/source/core/api/vectortoken.cxx
@@ -11,24 +11,26 @@
 
 namespace formula {
 
-VectorArray::VectorArray( const double* pArray, size_t nLength ) :
-mpArray(pArray), mnLength(nLength) {}
-
 SingleVectorRefToken::SingleVectorRefToken( const double* pArray, size_t 
nLength ) :
-FormulaToken(svSingleVectorRef, ocPush), maArray(pArray, nLength) {}
+FormulaToken(svSingleVectorRef, ocPush), mpArray(pArray), 
mnLength(nLength) {}
 
 FormulaToken* SingleVectorRefToken::Clone() const
 {
-return new SingleVectorRefToken(maArray.mpArray, maArray.mnLength);
+return new SingleVectorRefToken(mpArray, mnLength);
+}
+
+const double* SingleVectorRefToken::GetArray() const
+{
+return mpArray;
 }
 
-const VectorArray& SingleVectorRefToken::GetArray() const
+size_t SingleVectorRefToken::GetLength() const
 {
-return maArray;
+return mnLength;
 }
 
 DoubleVectorRefToken::DoubleVectorRefToken(
-const std::vector& rArrays, size_t nRowSize, bool bAbsStart, 
bool bAbsEnd ) :
+const std::vector& rArrays, size_t nRowSize, bool 
bAbsStart, bool bAbsEnd ) :
 FormulaToken(svDoubleVectorRef, ocPush),
 maArrays(rArrays), mnRowSize(nRowSize), mbAbsStart(bAbsStart), 
mbAbsEnd(bAbsEnd) {}
 
@@ -37,7 +39,7 @@ FormulaToken* DoubleVectorRefToken::Clone() const
 return new DoubleVectorRefToken(maArrays, mnRowSize, mbAbsStart, mbAbsEnd);
 }
 
-const std::vector& DoubleVectorRefToken::GetArrays() const
+const std::vector& DoubleVectorRefToken::GetArrays() const
 {
 return maArrays;
 }
diff --git a/include/formula/vectortoken.hxx b/include/formula/vectortoken.hxx
index 82051d4..db44355 100644
--- a/include/formula/vectortoken.hxx
+++ b/include/formula/vectortoken.hxx
@@ -14,23 +14,18 @@
 
 namespace formula {
 
-struct VectorArray
+class FORMULA_DLLPUBLIC SingleVectorRefToken : public FormulaToken
 {
 const double* mpArray;
 size_t mnLength;
 
-VectorArray( const double* pArray, size_t nLength );
-};
-
-class FORMULA_DLLPUBLIC SingleVectorRefToken : public FormulaToken
-{
-const VectorArray maArray;
 public:
 SingleVectorRefToken( const double* pArray, size_t nLength );
 
 virtual FormulaToken* Clone() const;
 
-const VectorArray& GetArray() const;
+const double* GetArray() const;
+size_t GetLength() const;
 };
 
 /**
@@ -39,7 +34,7 @@ public:
  */
 class FORMULA_DLLPUBLIC DoubleVectorRefToken : public FormulaToken
 {
-std::vector maArrays;
+std::vector maArrays;
 
 size_t mnRowSize;
 
@@ -48,11 +43,11 @@ class FORMULA_DLLPUBLIC DoubleVectorRefToken : public 
FormulaToken
 
 public:
 DoubleVectorRefToken(
-const std::vector& rArrays, size_t nRowSize, bool 
bAbsStart, bool bAbsEnd );
+const std::vector& rArrays, size_t nRowSize, bool 
bAbsStart, bool bAbsEnd );
 
 virtual FormulaToken* Clone() const;
 
-const std::vector& GetArrays() const;
+const std::vector& GetArrays() const;
 };
 
 }
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 5753e44..ba039b6 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3063,8 +3063,8 @@ bool ScFormulaCell::InterpretFormulaGroup()
 case svSingleVectorRef:
 {
 const formula::SingleVectorRefToken* p2 = 
static_cast(p);
-const formula::VectorArray& rArray = p2->GetArray();
-aCode2.AddDouble(rArray.mpArray[i]);
+const double* pArray = p2->GetArray();
+aCode2.AddDouble(pArray[i]);
 }
 break;
 case svDoubleVectorRef:
___
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 |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 36dd73bbe0b098ddb677724eec799f4e9fb47dc8
Author: Kohei Yoshida 
Date:   Mon Apr 29 17:22:31 2013 -0400

Some comment.

Change-Id: Ie7015231944547254562031864e7691333f02947

diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 236474d..5753e44 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -2993,6 +2993,12 @@ bool ScFormulaCell::InterpretFormulaGroup()
 // Fetch double array guarantees that the length of the
 // returned array equals or greater than the requested
 // length.
+
+// TODO: For now, it returns an array pointer only when
+// the entire array is in contiguous memory space.  Once
+// we finish cell storage rework, we'll support temporary
+// generation of a double array which is a combination of
+// multiple cell array segments.
 const double* pArray = pDocument->FetchDoubleArray(aCxt, 
aRefPos, xGroup->mnLength);
 if (!pArray)
 return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Forgot "with_dir"

[Julien Nabet (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3688

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/88/3688/1

Forgot "with_dir"

Change-Id: I1457f5619984671e8cb88173d204d3157d3cb883
---
M liblangtag/ExternalPackage_liblangtag_data.mk
1 file changed, 1 insertion(+), 1 deletion(-)



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_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 \

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1457f5619984671e8cb88173d204d3157d3cb883
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet 

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

Re: checks split from default build

[Rene Engelhard]

Hi,

On Mon, Apr 29, 2013 at 10:03:37PM +0200, Tomáš Chvátal wrote:
>I was just wondering if there is some patchset already written that moves

Yes.

>all unit/cpp/whatever/checks from the build target to "check" target.
>So finally after the time I would be able to execute them all in proper
>location during the test phase. :-)

http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git;a=blob;f=patches/build-dont-run-checks.diff;h=2c890fb93b4efcdfc6e12515ecae7c7a25561e63;hb=refs/heads/debian-experimental-4.0

Regards,

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

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

[Kohei Yoshida]

 sc/inc/column.hxx   |6 +-
 sc/inc/document.hxx |6 +-
 sc/inc/formulagroup.hxx |   30 ++
 sc/inc/table.hxx|7 ++-
 sc/source/core/data/column2.cxx |5 -
 sc/source/core/data/document.cxx|5 +++--
 sc/source/core/data/formulacell.cxx |5 -
 sc/source/core/data/table1.cxx  |5 +++--
 8 files changed, 60 insertions(+), 9 deletions(-)

New commits:
commit 7baf318bf56c8093fdbdeb4d54f56cbe9cadc81c
Author: Kohei Yoshida 
Date:   Mon Apr 29 17:15:32 2013 -0400

Pass formula group context to FetchDoubleArray. Not yet used.

In the future I'll use it to store temporary double array buffer here,
in case the requested row span is over multiple arrays.

Change-Id: Id4260ec4ced4c8c1ee718106f37a7374c62b204c

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 9b6e614..e70f108 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -45,6 +45,10 @@
 
 namespace editeng { class SvxBorderLine; }
 
+namespace sc {
+struct FormulaGroupContext;
+}
+
 class Fraction;
 class OutputDevice;
 class SfxItemPoolCache;
@@ -460,7 +464,7 @@ public:
 ScFormulaVectorState GetFormulaVectorState( SCROW nRow ) const;
 formula::FormulaTokenRef ResolveStaticReference( SCROW nRow );
 bool ResolveStaticReference( ScMatrix& rMat, SCCOL nMatCol, SCROW nRow1, 
SCROW nRow2 );
-const double* FetchDoubleArray( SCROW nRow1, SCROW nRow2 ) const;
+const double* FetchDoubleArray( sc::FormulaGroupContext& rCxt, SCROW 
nRow1, SCROW nRow2 ) const;
 
 ScRefCellValue GetRefCellValue( SCROW );
 
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 876c9d7..0920dd5e 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -47,6 +47,9 @@
 #include 
 
 namespace editeng { class SvxBorderLine; }
+namespace sc {
+struct FormulaGroupContext;
+}
 class SvxFontItem;
 
 class KeyEvent;
@@ -1944,7 +1947,8 @@ public:
 formula::FormulaTokenRef ResolveStaticReference( const ScAddress& rPos );
 formula::FormulaTokenRef ResolveStaticReference( const ScRange& rRange );
 
-const double* FetchDoubleArray( const ScAddress& rPos, SCROW nLength ) 
const;
+const double* FetchDoubleArray(
+sc::FormulaGroupContext& rCxt, const ScAddress& rPos, SCROW nLength ) 
const;
 
 private: // CLOOK-Impl-methods
 
diff --git a/sc/inc/formulagroup.hxx b/sc/inc/formulagroup.hxx
new file mode 100644
index 000..0a8e3f7
--- /dev/null
+++ b/sc/inc/formulagroup.hxx
@@ -0,0 +1,30 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef SC_FORMULAGROUP_HXX
+#define SC_FORMULAGROUP_HXX
+
+#include 
+#include 
+
+namespace sc {
+
+struct FormulaGroupContext : boost::noncopyable
+{
+typedef std::vector DoubleArrayType;
+typedef boost::ptr_vector ArrayStoreType;
+
+ArrayStoreType maArrays;
+};
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 7c45a57..c090f8b 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -47,6 +47,10 @@ namespace com { namespace sun { namespace star {
 }
 } } }
 
+namespace sc {
+struct FormulaGroupContext;
+}
+
 class SfxItemSet;
 class SfxStyleSheetBase;
 class SvxBoxInfoItem;
@@ -822,7 +826,8 @@ public:
 ScFormulaVectorState GetFormulaVectorState( SCCOL nCol, SCROW nRow ) const;
 formula::FormulaTokenRef ResolveStaticReference( SCCOL nCol, SCROW nRow );
 formula::FormulaTokenRef ResolveStaticReference( SCCOL nCol1, SCROW nRow1, 
SCCOL nCol2, SCROW nRow2 );
-const double* FetchDoubleArray( SCCOL nCol, SCROW nRow1, SCROW nRow2 ) 
const;
+const double* FetchDoubleArray(
+sc::FormulaGroupContext& rCxt, SCCOL nCol, SCROW nRow1, SCROW nRow2 ) 
const;
 
 ScRefCellValue GetRefCellValue( SCCOL nCol, SCROW nRow );
 
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 434edad..2e20d0f 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -57,6 +57,7 @@
 #include "cellvalue.hxx"
 #include "tokenarray.hxx"
 #include "globalnames.hxx"
+#include "formulagroup.hxx"
 
 #include 
 
@@ -1661,8 +1662,10 @@ bool ScColumn::ResolveStaticReference( ScMatrix& rMat, 
SCCOL nMatCol, SCROW nRow
 return true;
 }
 
-const double* ScColumn::FetchDoubleArray( SCROW nRow1, SCROW nRow2 ) const
+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/document.cxx b/sc/source/core/data/docum

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

[Khaled Hosny]

 vcl/generic/glyphs/gcach_layout.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3719396649c8c944727f89c517a8191cd37b2499
Author: Khaled Hosny 
Date:   Mon Apr 29 22:13:44 2013 +0200

[harfbuzz] Don't crash when closing LibreOffice

We shouldn't be trying to free the font table buffer when destroying the
blob, so pass NULL for destroy function instead of free(), and also use
HB_MEMORY_MODE_READONLY just to be safe.

Change-Id: I85b5a575249b4efc0f5799db205ee17cbeb66d22

diff --git a/vcl/generic/glyphs/gcach_layout.cxx 
b/vcl/generic/glyphs/gcach_layout.cxx
index abd1ab8..5fea884 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -220,7 +220,7 @@ static hb_blob_t *getFontTable(hb_face_t* /*face*/, 
hb_tag_t nTableTag, void* pU
 
 hb_blob_t* pBlob = NULL;
 if (pBuffer != NULL)
-pBlob = hb_blob_create((const char*) pBuffer, nLength, 
HB_MEMORY_MODE_WRITABLE, (void*) pBuffer, free);
+pBlob = hb_blob_create((const char*) pBuffer, nLength, 
HB_MEMORY_MODE_READONLY, (void*) pBuffer, NULL);
 
 return pBlob;
 }
___
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_openoffice

[Andras Timar]

 instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt |1 +
 instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt |1 +
 2 files changed, 2 insertions(+)

New commits:
commit a411ad0377ba4ea4dd76997582de59f747a98e00
Author: Andras Timar 
Date:   Mon Apr 29 22:08:13 2013 +0200

property REINSTALL should be set only when we apply a PATCH

with 11dd1094cb5452a8b61ad6bd284ba9517d3d869a I introduced
REINSTALL=ALL in the Property table, because without this MSP
patches did not work as expected -- some files were not patched.
I found "The file represented by File table key 'foo.bar' has
no eligible binary patches" lines in the log, and I did not find
a better solution. I'll revisit the problem later, maybe file versioning
can be changed. Windows Installer usually ignores the fourth digit in
version numbers, and we bump the the fourth digit only (i.e. 3.6.10.304 ->
3.6.10.520).

However, when upgrading a patched 3.6 to 4.0, REINSTALL=ALL strikes back.
Windows Installer passes REMOVE=ALL argument to 3.6 package, but 
REINSTALL=ALL
takes precedence, so 3.6 will not be removed, but reinstalled! 3.6 and 4.0
both will be installed, there will be an entry for each in Add/Remove 
Programs
Control Panel applet.

So I made REINSTALL=ALL conditional, and as a side effect, normal MSI
packages built from PTF branches will be fully useable again. If REINSTALL
is set for a product that is yet to be installed, no installation action
will take place at all. It really makes sense to selectively enable it
only for patches. I'm sorry that I did not figure this out earlier.

Change-Id: Ic05dc66579c60f1eb599baf6be4289b22301cebe

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
index dd128b2..3a4c106 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
@@ -12,3 +12,4 @@ SetLanguageSelected   51  LANG_SELECTED   1
 ResetLanguageSelected  51  LANG_SELECTED   0
 SetApplicationSelected 51  APP_SELECTED1
 ResetApplicationSelected   51  APP_SELECTED0
+PatchInstall   51  REINSTALL   ALL
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
index 3da59dc..828e80f 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
@@ -15,6 +15,7 @@ FileCost  400
 FindRelatedProductsNOT ISSETUPDRIVEN   100
 InstallFiles   1950
 InstallFinalize3150
+PatchInstall   PATCH   699
 InstallInitialize  700
 InstallODBC2600
 InstallServicesVersionNT   2750
___
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' - instsetoo_native/inc_openoffice

[Andras Timar]

 instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt |1 +
 instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt |1 +
 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt |1 -
 3 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 007283a49efed964a9e5801989cb3cdbbba89125
Author: Andras Timar 
Date:   Mon Apr 29 22:08:13 2013 +0200

property REINSTALL should be set only when we apply a PATCH

with 11dd1094cb5452a8b61ad6bd284ba9517d3d869a I introduced
REINSTALL=ALL in the Property table, because without this MSP
patches did not work as expected -- some files were not patched.
I found "The file represented by File table key 'foo.bar' has
no eligible binary patches" lines in the log, and I did not find
a better solution. I'll revisit the problem later, maybe file versioning
can be changed. Windows Installer usually ignores the fourth digit in
version numbers, and we bump the the fourth digit only (i.e. 3.6.10.304 ->
3.6.10.520).

However, when upgrading a patched 3.6 to 4.0, REINSTALL=ALL strikes back.
Windows Installer passes REMOVE=ALL argument to 3.6 package, but 
REINSTALL=ALL
takes precedence, so 3.6 will not be removed, but reinstalled! 3.6 and 4.0
both will be installed, there will be an entry for each in Add/Remove 
Programs
Control Panel applet.

So I made REINSTALL=ALL conditional, and as a side effect, normal MSI
packages built from PTF branches will be fully useable again. If REINSTALL
is set for a product that is yet to be installed, no installation action
will take place at all. It really makes sense to selectively enable it
only for patches. I'm sorry that I did not figure this out earlier.

Change-Id: Ic05dc66579c60f1eb599baf6be4289b22301cebe

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
index dd128b2..3a4c106 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
@@ -12,3 +12,4 @@ SetLanguageSelected   51  LANG_SELECTED   1
 ResetLanguageSelected  51  LANG_SELECTED   0
 SetApplicationSelected 51  APP_SELECTED1
 ResetApplicationSelected   51  APP_SELECTED0
+PatchInstall   51  REINSTALL   ALL
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
index 115ac87..bda85c7 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
@@ -15,6 +15,7 @@ FileCost  400
 FindRelatedProductsNOT ISSETUPDRIVEN   100
 InstallFiles   1950
 InstallFinalize3150
+PatchInstall   PATCH   699
 InstallInitialize  700
 InstallODBC2600
 InstallServicesVersionNT   2750
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
index 061c335..d19f530 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
@@ -42,7 +42,6 @@ ProgressType3 installs
 Quickstarterlinkname   QUICKSTARTERLINKNAMETEMPLATE
 RebootYesNoYes
 ReinstallModeText  omus
-REINSTALL  ALL
 SecureCustomProperties 
NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS;OLDPRODUCTSSAMEMAJOR;OLDPRODUCTS2;BETAPRODUCTS;STUBPRODUCTS
 SetupType  Typical
 SELECT_WORD0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

checks split from default build

[Tomáš Chvátal]

Hi guys,

I was just wondering if there is some patchset already written that moves
all unit/cpp/whatever/checks from the build target to "check" target.

So finally after the time I would be able to execute them all in proper
location during the test phase. :-)

Cheers

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

Re: [Cygwin] [Master] failure when compiling liblangtag

[Eike Rathke]

Hi Peter,

On Monday, 2013-04-29 18:27:41 +0200, Eike Rathke wrote:

> We now have the same failure with an upgrade to liblangtag-0.5.0, see
> https://gerrit.libreoffice.org/3676 and the error log
> https://ci.libreoffice.org/job/buildbot/663

Forget that, it's something different.

Still, for me with ccache enabled the original failure this thread
started occurs. And I do have 28fb57daa77438f5e63132d3417062a11a44461e

Changing in config_host.mk

export CXX=/usr/bin/ccache /cygdrive/c/PROGRA~2/MICROS~1.0/VC/bin/cl.exe
export CC=/usr/bin/ccache /cygdrive/c/PROGRA~2/MICROS~1.0/VC/bin/cl.exe
export CC_FOR_BUILD=/usr/bin/ccache 
/cygdrive/c/PROGRA~2/MICROS~1.0/VC/bin/cl.exe

to

export CXX=/cygdrive/c/PROGRA~2/MICROS~1.0/VC/bin/cl.exe
export CC=/cygdrive/c/PROGRA~2/MICROS~1.0/VC/bin/cl.exe
export CC_FOR_BUILD=/cygdrive/c/PROGRA~2/MICROS~1.0/VC/bin/cl.exe

worked for me.

  Eike

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


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

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

[David Ostrovsky]

 sw/qa/python/var_fields.py |   18 --
 1 file changed, 4 insertions(+), 14 deletions(-)

New commits:
commit bfa6aab3992dfca2312ffd626d975b25f84544fe
Author: David Ostrovsky 
Date:   Tue Apr 30 00:01:06 2013 +0200

fix refresh() call

Change-Id: Id7cb705b2b719cdd3bf16b8aba858c0319686599

diff --git a/sw/qa/python/var_fields.py b/sw/qa/python/var_fields.py
index 1a8a801..3222f17 100644
--- a/sw/qa/python/var_fields.py
+++ b/sw/qa/python/var_fields.py
@@ -23,16 +23,6 @@ class TestVarFields(unittest.TestCase):
 Note: this test was migrated from java (the steps numbering too)
 sw/qa/complex/writer/VarFields.java
 
-TODO:
-Unlike in java, this test doesn't overwrite the field condition.
-Apparently xDoc.refresh() is somehow broken (from python), because 
doing the update
-manually does overwrite the condition:
-1. run the python test with make verbose=t PythonTest_sw_python
-2. open created document with
-./install/program/soffice.bin 
workdir/unxlngx6.pro/PythonTest/sw_python/VarFields.odt
-3. check that TextSection's condition still has the right value: "foo 
EQ 1"
-4. Update field with Tool=>Update=>Fields (or [F9])
-5. check that TextSection's condition was overriden: "0"
 """
 xDoc = self.__class__._xDoc
 xBodyText = xDoc.getText()
@@ -86,7 +76,7 @@ class TestVarFields(unittest.TestCase):
 # 13. Access fields to refresh the document
 xEnumerationAccess = xDoc.getTextFields()
 # 14. refresh document to update the fields
-xDoc.refresh()
+xEnumerationAccess.refresh()
 # 15. retrieve the field
 xFieldEnum = xEnumerationAccess.createEnumeration()
 # Note: we have only one field here, that why nextElement() is just 
fine here
@@ -105,7 +95,7 @@ class TestVarFields(unittest.TestCase):
 self
 )
 # 17. refresh document to update the fields again
-xDoc.refresh()
+xEnumerationAccess.refresh()
 # 18. store document
 url = os.path.join(os.environ["TestUserDir"], "VarFields.odt")
 xDoc.storeToURL(url, tuple(list(range(0
@@ -115,9 +105,9 @@ class TestVarFields(unittest.TestCase):
 readContent = xPropSet.getPropertyValue("Condition")
 # 21. check
 # expected:
-self.assertEqual("foo EQ 1", readContent)
+#self.assertEqual("foo EQ 1", readContent)
 # reality:
-#self.assertEqual("0", readContent)
+self.assertEqual("0", readContent)
 
 if __name__ == '__main__':
 unittest.main()
___
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' - formula/source include/formula

[Kohei Yoshida]

 formula/source/core/api/vectortoken.cxx |   10 ++
 include/formula/vectortoken.hxx |4 
 2 files changed, 14 insertions(+)

New commits:
commit 8d08f87faa0afb281301712a8b9555d5b94eccbc
Author: Kohei Yoshida 
Date:   Mon Apr 29 15:28:30 2013 -0400

Let's not forget to check this in...

Curse the sc / formula split...

Change-Id: Ib8d17ba63d05eb4df7e6918e0034d91dd82869e3

diff --git a/formula/source/core/api/vectortoken.cxx 
b/formula/source/core/api/vectortoken.cxx
index 0c2e455..94a071c 100644
--- a/formula/source/core/api/vectortoken.cxx
+++ b/formula/source/core/api/vectortoken.cxx
@@ -17,6 +17,11 @@ VectorArray::VectorArray( const double* pArray, size_t 
nLength ) :
 SingleVectorRefToken::SingleVectorRefToken( const double* pArray, size_t 
nLength ) :
 FormulaToken(svSingleVectorRef, ocPush), maArray(pArray, nLength) {}
 
+FormulaToken* SingleVectorRefToken::Clone() const
+{
+return new SingleVectorRefToken(maArray.mpArray, maArray.mnLength);
+}
+
 const VectorArray& SingleVectorRefToken::GetArray() const
 {
 return maArray;
@@ -27,6 +32,11 @@ DoubleVectorRefToken::DoubleVectorRefToken(
 FormulaToken(svDoubleVectorRef, ocPush),
 maArrays(rArrays), mnRowSize(nRowSize), mbAbsStart(bAbsStart), 
mbAbsEnd(bAbsEnd) {}
 
+FormulaToken* DoubleVectorRefToken::Clone() const
+{
+return new DoubleVectorRefToken(maArrays, mnRowSize, mbAbsStart, mbAbsEnd);
+}
+
 const std::vector& DoubleVectorRefToken::GetArrays() const
 {
 return maArrays;
diff --git a/include/formula/vectortoken.hxx b/include/formula/vectortoken.hxx
index 90e28d8..82051d4 100644
--- a/include/formula/vectortoken.hxx
+++ b/include/formula/vectortoken.hxx
@@ -28,6 +28,8 @@ class FORMULA_DLLPUBLIC SingleVectorRefToken : public 
FormulaToken
 public:
 SingleVectorRefToken( const double* pArray, size_t nLength );
 
+virtual FormulaToken* Clone() const;
+
 const VectorArray& GetArray() const;
 };
 
@@ -48,6 +50,8 @@ public:
 DoubleVectorRefToken(
 const std::vector& rArrays, size_t nRowSize, bool 
bAbsStart, bool bAbsEnd );
 
+virtual FormulaToken* Clone() const;
+
 const std::vector& GetArrays() 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' - vbahelper/source

[Noel Power]

 vbahelper/source/msforms/vbacontrol.cxx |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 8eb150e65632d9d04fe4d580471cdbdd9f80ccd4
Author: Noel Power 
Date:   Mon Apr 29 19:41:45 2013 +0100

create togglebutton class ( for togglebutton on sheet )

Change-Id: If987eb6ed04d80e62b4b418e8f9de3a143ef68a7

diff --git a/vbahelper/source/msforms/vbacontrol.cxx 
b/vbahelper/source/msforms/vbacontrol.cxx
index b788368..516cfa6 100644
--- a/vbahelper/source/msforms/vbacontrol.cxx
+++ b/vbahelper/source/msforms/vbacontrol.cxx
@@ -615,7 +615,14 @@ void SAL_CALL ScVbaControl::setTabIndex( sal_Int32 
/*nTabIndex*/ ) throw (uno::R
 case form::FormComponentType::COMBOBOX:
 return new ScVbaComboBox( xVbaParent, xContext, xControlShape, 
xModel, xGeoHelper.release() );
 case form::FormComponentType::COMMANDBUTTON:
-return new ScVbaButton( xVbaParent, xContext, xControlShape, 
xModel, xGeoHelper.release() );
+{
+sal_Bool bToggle = sal_False;
+xProps->getPropertyValue( "Toggle" ) >>= bToggle;
+if ( bToggle )
+return new ScVbaToggleButton( xVbaParent, xContext, 
xControlShape, xModel, xGeoHelper.release() );
+else
+return new ScVbaButton( xVbaParent, xContext, xControlShape, 
xModel, xGeoHelper.release() );
+}
 case form::FormComponentType::FIXEDTEXT:
 return new ScVbaLabel( xVbaParent, xContext, xControlShape, 
xModel, xGeoHelper.release() );
 case form::FormComponentType::TEXTFIELD:
___
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/source

[Kohei Yoshida]

 sc/inc/column.hxx   |2 +-
 sc/source/core/data/column.cxx  |   13 ++---
 sc/source/core/data/column2.cxx |1 +
 sc/source/core/data/column3.cxx |   15 ++-
 4 files changed, 6 insertions(+), 25 deletions(-)

New commits:
commit 5f461f32fea980df4d89fbbbc815800d8d5deb40
Author: Kohei Yoshida 
Date:   Mon Apr 29 15:17:47 2013 -0400

CellStorageModified() is the right (and only) place to mark group dirty.

CellStorageModified is supposed to be called whenever the cell array
content changes. We should take advantage of it.

Change-Id: Ib1cd0e91f3d5a3d03d2172ed6cc916520d1baa49

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 6b3202a..9b6e614 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -139,7 +139,7 @@ class ScColumn
 
 ScAttrArray*  pAttrArray;
 ScDocument*   pDocument;
-bool  bDirtyGroups; /// formula groups are dirty.
+bool mbDirtyGroups; /// formula groups are dirty.
 
 friend class ScDocument;// for FillInfo
 friend class ScDocumentIterator;
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 17bbe68..da9aa3c 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -116,7 +116,7 @@ ScColumn::ScColumn() :
 nCol( 0 ),
 pAttrArray( NULL ),
 pDocument( NULL ),
-bDirtyGroups( true )
+mbDirtyGroups(true)
 {
 }
 
@@ -134,7 +134,6 @@ void ScColumn::Init(SCCOL nNewCol, SCTAB nNewTab, 
ScDocument* pDoc)
 nTab = nNewTab;
 pDocument = pDoc;
 pAttrArray = new ScAttrArray( nCol, nTab, pDocument );
-bDirtyGroups = true;
 }
 
 
@@ -893,8 +892,6 @@ void ScColumn::SwapRow(SCROW nRow1, SCROW nRow2)
 ::std::swap( pCell1, pCell2 );
 }
 
-bDirtyGroups = true;
-
 // from here: first cell (pCell1, nIndex1) exists always
 
 ScAddress aPos1( nCol, nRow1, nTab );
@@ -1054,8 +1051,6 @@ void ScColumn::SwapCell( SCROW nRow, ScColumn& rCol)
 return;
 }
 
-bDirtyGroups = true;
-
 // from here: own cell (pCell1, nIndex1) exists always
 
 ScFormulaCell* pFmlaCell1 = (pCell1->GetCellType() == CELLTYPE_FORMULA) ? 
static_cast< ScFormulaCell* >( pCell1 ) : 0;
@@ -1175,8 +1170,6 @@ void ScColumn::InsertRow( SCROW nStartRow, SCSIZE nSize )
 if ( i >= maItems.size() )
 return ;
 
-bDirtyGroups = true;
-
 bool bOldAutoCalc = pDocument->GetAutoCalc();
 pDocument->SetAutoCalc( false );// avoid recalculations
 
@@ -1711,9 +1704,7 @@ void ScColumn::SwapCol(ScColumn& rCol)
 pAttrArray->SetCol(nCol);
 rCol.pAttrArray->SetCol(rCol.nCol);
 
-bool bDirty = bDirtyGroups;
-bDirtyGroups = rCol.bDirtyGroups;
-rCol.bDirtyGroups = bDirty;
+std::swap(mbDirtyGroups, rCol.mbDirtyGroups);
 
 SCSIZE i;
 for (i = 0; i < maItems.size(); i++)
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 25725ae..434edad 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1398,6 +1398,7 @@ SCROW ScColumn::FindNextVisibleRowWithContent(SCROW nRow, 
bool bForward) const
 
 void ScColumn::CellStorageModified()
 {
+mbDirtyGroups = true;
 #if DEBUG_COLUMN_STORAGE
 if (maItems.empty())
 {
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 615fbaf..63b3a5f 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -87,7 +87,6 @@ void ScColumn::Insert( SCROW nRow, ScBaseCell* pNewCell )
 ScAddress( nCol, nRow, nTab ), pNewCell->GetBroadcaster()) 
);
 }
 }
-bDirtyGroups = true;
 }
 
 
@@ -95,7 +94,6 @@ void ScColumn::Insert( SCROW nRow, sal_uInt32 nNumberFormat, 
ScBaseCell* pCell )
 {
 Insert(nRow, pCell);
 SetNumberFormat(nRow, nNumberFormat);
-bDirtyGroups = true;
 }
 
 
@@ -105,7 +103,6 @@ void ScColumn::Append( SCROW nRow, ScBaseCell* pCell )
 maItems.back().pCell = pCell;
 maItems.back().nRow  = nRow;
 
-bDirtyGroups = true;
 maTextWidths.set(nRow, TEXTWIDTH_DIRTY);
 maScriptTypes.set(nRow, SC_SCRIPTTYPE_UNKNOWN);
 CellStorageModified();
@@ -138,7 +135,6 @@ void ScColumn::Delete( SCROW nRow )
 if (pCell->GetCellType() == CELLTYPE_FORMULA)
 static_cast(pCell)->EndListeningTo(pDocument);
 pCell->Delete();
-bDirtyGroups = true;
 
 CellStorageModified();
 }
@@ -159,7 +155,6 @@ void ScColumn::DeleteAtIndex( SCSIZE nIndex )
 static_cast(pCell)->EndListeningTo(pDocument);
 pCell->Delete();
 
-bDirtyGroups = true;
 maTextWidths.set_empty(nRow, nRow);
 maScriptTypes.set_empty(nRow, nRow);
 CellStorageModified();
@@ -196,8 +191,6 @@ void ScColumn::DeleteRow( SCROW nStartRow, SCSIZE nSize )
 sal_Bool bOldAutoCalc = pDocument->GetAutoCalc();
 pDocument->SetAutoCalc( false ); // Avoid calculating it multiple times
 
-bDirtyGroups = true;
-
 

Re: [Cygwin] [Master] failure when compiling liblangtag

[Eike Rathke]

Hi,

On Monday, 2013-04-29 18:27:41 +0200, Eike Rathke wrote:

> We now have the same failure with an upgrade to liblangtag-0.5.0, see
> https://gerrit.libreoffice.org/3676 and the error log
> https://ci.libreoffice.org/job/buildbot/663

Also reproduced this now in a local build. It seems to be related to ccache,
temporarily removing ccache from config_host.mk CC= et al made the error go
away.

  Eike

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


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

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

[Kohei Yoshida]

 sc/source/core/data/formulacell.cxx |   72 ++--
 1 file changed, 45 insertions(+), 27 deletions(-)

New commits:
commit 57999ad590589b13ad7fd32e8c7f2712ec335f81
Author: Kohei Yoshida 
Date:   Mon Apr 29 15:09:42 2013 -0400

Test-drive grouped formula calculation.

But of course since we haven't yet implemented the real vectorized
calculation backend, we calculate the cells individually...

Change-Id: I27e0a3e846f62a7fcda86a79e9455c81e3737ddf

diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 20ec752..278a299 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3037,34 +3037,52 @@ bool ScFormulaCell::InterpretFormulaGroup()
 }
 }
 
-// scan the formula ...
-// have a document method: "Get2DRangeAsDoublesArray" that does the
-// column-based heavy lifting call it for each absolute range from the
-// first cell pos in the formula group.
-//
-// Project single references to ranges by adding their vector * 
xGroup->mnLength
-//
-// TODO:
-//elide multiple dimensional movement in vectors eg. =SUM(A1<1,1>)
-//produces a diagonal 'column' that serves no useful purpose for us.
-//these should be very rare. Should elide in GetDeltas anyway and
-//assert here.
-//
-// Having built our input data ...
-// Throw it, and the formula over to some 'OpenCLCalculage' hook
-//
-// on return - release references on these double buffers
-//
-// transfer the result to the formula cells (as above)
-// store the doubles in the columns' maDoubles array for
-// dependent formulae
-//
-// TODO:
-//need to abort/fail when we get errors returned and fallback to
-//stock interpreting [ I guess ], unless we can use NaN etc. to
-//signal errors.
+#if 0
+// TODO: Calculate the formula group via vectorization.
+#else
+// Until we implement group calculation for real, decompose the group into
+// individual formula token arrays for individual calculation.
+ScAddress aTmpPos = aPos;
+for (sal_Int32 i = 0; i < xGroup->mnLength; ++i)
+{
+aTmpPos.SetRow(xGroup->mnStart + i);
+ScTokenArray aCode2;
+for (const formula::FormulaToken* p = aCode.First(); p; p = 
aCode.Next())
+{
+switch (p->GetType())
+{
+case svSingleVectorRef:
+{
+const formula::SingleVectorRefToken* p2 = 
static_cast(p);
+const formula::VectorArray& rArray = p2->GetArray();
+aCode2.AddDouble(rArray.mpArray[i]);
+}
+break;
+case svDoubleVectorRef:
+return false;
+break;
+default:
+aCode2.AddToken(*p);
+}
+}
 
-return false;
+ScFormulaCell* pDest = pDocument->GetFormulaCell(aTmpPos);
+if (!pDest)
+return false;
+
+ScCompiler aComp(pDocument, aPos, aCode2);
+aComp.SetGrammar(pDocument->GetGrammar());
+OUStringBuffer aBuf;
+aComp.CreateStringFromTokenArray(aBuf);
+aComp.CompileTokenArray(); // Create RPN token array.
+ScInterpreter aInterpreter(pDest, pDocument, aTmpPos, aCode2);
+aInterpreter.Interpret();
+
+pDest->aResult.SetToken(aInterpreter.GetResultToken().get());
+}
+
+return true;
+#endif
 }
 
 bool ScFormulaCell::InterpretInvariantFormulaGroup()
___
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' - formula/source include/formula sc/inc sc/source

[Kohei Yoshida]

 formula/source/core/api/vectortoken.cxx |4 -
 include/formula/vectortoken.hxx |4 -
 sc/inc/column.hxx   |9 +++
 sc/inc/document.hxx |2 
 sc/inc/table.hxx|1 
 sc/source/core/data/column.cxx  |   21 +++
 sc/source/core/data/column2.cxx |   56 ---
 sc/source/core/data/document.cxx|9 +++
 sc/source/core/data/formulacell.cxx |   90 
 sc/source/core/data/table1.cxx  |   11 +++
 10 files changed, 183 insertions(+), 24 deletions(-)

New commits:
commit fdc968dfd2423da3a349c2d6a6e9153745c511c2
Author: Kohei Yoshida 
Date:   Mon Apr 29 14:14:43 2013 -0400

Add method to allow fetching of double array, and store it in token.

Change-Id: If094dbf139e18ad23c73d6cf5a78ac4844132b14

diff --git a/formula/source/core/api/vectortoken.cxx 
b/formula/source/core/api/vectortoken.cxx
index b7cab77..0c2e455 100644
--- a/formula/source/core/api/vectortoken.cxx
+++ b/formula/source/core/api/vectortoken.cxx
@@ -23,9 +23,9 @@ const VectorArray& SingleVectorRefToken::GetArray() const
 }
 
 DoubleVectorRefToken::DoubleVectorRefToken(
-const std::vector& rArrays, size_t nColSize, size_t nRowSize, 
bool bAbsStart, bool bAbsEnd ) :
+const std::vector& rArrays, size_t nRowSize, bool bAbsStart, 
bool bAbsEnd ) :
 FormulaToken(svDoubleVectorRef, ocPush),
-maArrays(rArrays), mnColSize(nColSize), mnRowSize(nRowSize), 
mbAbsStart(bAbsStart), mbAbsEnd(bAbsEnd) {}
+maArrays(rArrays), mnRowSize(nRowSize), mbAbsStart(bAbsStart), 
mbAbsEnd(bAbsEnd) {}
 
 const std::vector& DoubleVectorRefToken::GetArrays() const
 {
diff --git a/include/formula/vectortoken.hxx b/include/formula/vectortoken.hxx
index 5af2690..90e28d8 100644
--- a/include/formula/vectortoken.hxx
+++ b/include/formula/vectortoken.hxx
@@ -39,7 +39,6 @@ class FORMULA_DLLPUBLIC DoubleVectorRefToken : public 
FormulaToken
 {
 std::vector maArrays;
 
-size_t mnColSize;
 size_t mnRowSize;
 
 bool mbAbsStart:1; /// whether or not the start row position is absolute.
@@ -47,8 +46,7 @@ class FORMULA_DLLPUBLIC DoubleVectorRefToken : public 
FormulaToken
 
 public:
 DoubleVectorRefToken(
-const std::vector& rArrays, size_t nColSize, size_t 
nRowSize,
-bool bAbsStart, bool bAbsEnd );
+const std::vector& rArrays, size_t nRowSize, bool 
bAbsStart, bool bAbsEnd );
 
 const std::vector& GetArrays() const;
 };
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 157bc17..6b3202a 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -106,6 +106,11 @@ struct ColDoubleEntry
 {
 SCROW   mnStart;
 std::vector maData;
+
+struct LessByPtr : std::binary_function
+{
+bool operator() (const ColDoubleEntry* p1, const ColDoubleEntry* p2) 
const;
+};
 };
 
 class ScColumn
@@ -155,6 +160,9 @@ friend class ScDocumentImport;
 
 static void SwapScriptTypes( ScriptType& rSrc, SCROW nSrcRow, ScriptType& 
rDest, SCROW nDestRow );
 
+std::vector::iterator Search( SCROW nRow );
+std::vector::const_iterator Search( SCROW nRow ) const;
+
 public:
 ScColumn();
 ~ScColumn();
@@ -452,6 +460,7 @@ public:
 ScFormulaVectorState GetFormulaVectorState( SCROW nRow ) const;
 formula::FormulaTokenRef ResolveStaticReference( SCROW nRow );
 bool ResolveStaticReference( ScMatrix& rMat, SCCOL nMatCol, SCROW nRow1, 
SCROW nRow2 );
+const double* FetchDoubleArray( SCROW nRow1, SCROW nRow2 ) const;
 
 ScRefCellValue GetRefCellValue( SCROW );
 
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index cdb80e0..876c9d7 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1944,6 +1944,8 @@ public:
 formula::FormulaTokenRef ResolveStaticReference( const ScAddress& rPos );
 formula::FormulaTokenRef ResolveStaticReference( const ScRange& rRange );
 
+const double* FetchDoubleArray( const ScAddress& rPos, SCROW nLength ) 
const;
+
 private: // CLOOK-Impl-methods
 
 /**
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index c04b902..7c45a57 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -822,6 +822,7 @@ public:
 ScFormulaVectorState GetFormulaVectorState( SCCOL nCol, SCROW nRow ) const;
 formula::FormulaTokenRef ResolveStaticReference( SCCOL nCol, SCROW nRow );
 formula::FormulaTokenRef ResolveStaticReference( SCCOL nCol1, SCROW nRow1, 
SCCOL nCol2, SCROW nRow2 );
+const double* FetchDoubleArray( SCCOL nCol, SCROW nRow1, SCROW nRow2 ) 
const;
 
 ScRefCellValue GetRefCellValue( SCCOL nCol, SCROW nRow );
 
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 0c3e630..17bbe68 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -50,6 +50,11 @@ bool ColEntry::Less::operator() (const ColEntry& r1, const 
ColEntry& r2) const
 return r1.nRow < r2.nRow;
 }
 
+bool ColDo

Re: Need help regarding BUG #60700

[Alex Ivan]

First of all, sorry for my late response.

Secondly, I'll explain what the logic for  this bugfix
   was.

The idea is that the storage elements are opened again in the
UIConfigurationManager::storeToStorage method (same file), so, basically, if
there is a need to store anything, they will be reopened as writeable.

As you pointed out, my current patch does not purge these directories in
files that already contain them, but are empty.
I've found  this documentation

  
of the XStorage interface, but I am not quite sure how to go about
determining if the storage element is empty. There surely is something I am
missing. It would be very helpful if someone could point me in the right
direction.

Also, a bit off topic, I made a post regarding GSOC
  .
Since the application deadline is closing in, any kind of response would be
extremely helpful.

Best wishes,
Alex Ivan



--
View this message in context: 
http://nabble.documentfoundation.org/Need-help-regarding-BUG-60700-tp4041113p4052847.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

[PUSHED libreoffice-4-0] fdo#62336 - fix horribly coupled table rendering code to not...

[Fridrich Strba (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/3687

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie0c5f39f6265e38534a6d0c9743877eef79e5954
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Michael Meeks 
Gerrit-Reviewer: Fridrich Strba 

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

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

[Michael Meeks]

 sw/source/filter/writer/wrtswtbl.cxx |   12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 0a115d48057867c60bfcd527e90433b2dca1f28a
Author: Michael Meeks 
Date:   Mon Apr 29 18:06:27 2013 +0100

fdo#62336 - fix horribly coupled table rendering code to not crash.

Change-Id: Ie0c5f39f6265e38534a6d0c9743877eef79e5954
Reviewed-on: https://gerrit.libreoffice.org/3687
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/sw/source/filter/writer/wrtswtbl.cxx 
b/sw/source/filter/writer/wrtswtbl.cxx
index 55afa3c..4699005 100644
--- a/sw/source/filter/writer/wrtswtbl.cxx
+++ b/sw/source/filter/writer/wrtswtbl.cxx
@@ -404,6 +404,10 @@ sal_Bool SwWriteTable::ShouldExpandSub(const SwTableBox 
*pBox, sal_Bool /*bExpan
 return !pBox->GetSttNd() && nDepth > 0;
 }
 
+// FIXME: the degree of coupling between this method and
+// FillTableRowsCols which is called immediately afterwards
+// is -extremely- unpleasant and potentially problematic.
+
 void SwWriteTable::CollectTableRowsCols( long nStartRPos,
sal_uInt32 nStartCPos,
long nParentLineHeight,
@@ -747,10 +751,16 @@ SwWriteTable::SwWriteTable(const SwTableLines& rLines, 
long nWidth,
 // Erstmal die Tabellen-Struktur festlegen. Hinter der Tabelle ist in
 // jedem Fall eine Spalte zu Ende
 SwWriteTableCol *pCol = new SwWriteTableCol( nParentWidth );
+bUseLayoutHeights = true;
 aCols.insert( pCol );
 CollectTableRowsCols( 0, 0, 0, nParentWidth, rLines, nMaxDepth - 1 );
 
-// Und jetzt mit leben fuellen
+// FIXME: awfully GetLineHeight writes to this in its first call
+// and proceeds to return a rather odd number fdo#62336, we have to
+// behave identically since the code in FillTableRowsCols duplicates
+// and is highly coupled to CollectTableRowsCols - sadly.
+bUseLayoutHeights = true;
+// And now fill with life
 FillTableRowsCols( 0, 0, 0, 0, 0, nParentWidth, rLines, 0, nMaxDepth - 1, 
static_cast< sal_uInt16 >(nNumOfRowsToRepeat) );
 
 // Einige Twip-Werte an Pixel-Grenzen anpassen
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-4-0-3] fdo#58949 EmbeddedObjectContainer: guard against embed::Wron...

[Petr Mladek (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/3658

Approvals:
  Petr Mladek: Verified; Looks good to me, approved
  David Tardon: Verified; Looks good to me, but someone else must approve


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I71a7abc45a89bebc667664bc001245bb886a8d83
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0-3
Gerrit-Owner: Petr Mladek 
Gerrit-Reviewer: David Tardon 
Gerrit-Reviewer: Fridrich Strba 
Gerrit-Reviewer: Miklos Vajna 
Gerrit-Reviewer: Petr Mladek 

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

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

[Miklos Vajna]

 comphelper/source/container/embeddedobjectcontainer.cxx |   15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)

New commits:
commit 800b17fd80433163e323775862a528fbebe60a11
Author: Miklos Vajna 
Date:   Fri Apr 26 11:46:57 2013 +0200

fdo#58949 EmbeddedObjectContainer: guard against embed::WrongStateException

The problem was that in case an exception was thrown, it was only caught
outside the loop, so in case any error occurred, we didn't even try to
export the remaining objects. At least in case of
embed::WrongStateException, this is safe to do.

(cherry picked from commit 6238cfe27f0a202f3fbf482cde2b0a3189adc86f)

Change-Id: I71a7abc45a89bebc667664bc001245bb886a8d83
Reviewed-on: https://gerrit.libreoffice.org/3624
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 
Reviewed-on: https://gerrit.libreoffice.org/3658
Tested-by: Petr Mladek 
Reviewed-by: David Tardon 
Tested-by: David Tardon 
Reviewed-by: Petr Mladek 

diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx 
b/comphelper/source/container/embeddedobjectcontainer.cxx
index ca0e4f1..935bf33 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -1415,10 +1415,14 @@ sal_Bool 
EmbeddedObjectContainer::StoreAsChildren(sal_Bool _bOasisFormat,sal_Boo
 aArgs[2].Value <<= xStream;
 }
 
-xPersist->storeAsEntry( _xStorage,
-xPersist->getEntryName(),
-uno::Sequence< 
beans::PropertyValue >(),
-aArgs );
+try
+{
+xPersist->storeAsEntry( _xStorage, 
xPersist->getEntryName(), uno::Sequence< beans::PropertyValue >(), aArgs );
+}
+catch (const embed::WrongStateException& e)
+{
+SAL_WARN("comphelper", "failed to store '" << *pIter 
<< "'");
+}
 }
 
 if ( bSwitchBackToLoaded )
@@ -1430,10 +1434,11 @@ sal_Bool 
EmbeddedObjectContainer::StoreAsChildren(sal_Bool _bOasisFormat,sal_Boo
 bResult = aCnt.CommitImageSubStorage();
 
 }
-catch (const uno::Exception&)
+catch (const uno::Exception& e)
 {
 // TODO/LATER: error handling
 bResult = sal_False;
+SAL_WARN("comphelper", "failed. Message: " << e.Message);
 }
 
 // the old SO6 format does not store graphical replacements
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH libreoffice-4-0] fdo#62336 - fix horribly coupled table rendering code to not...

[Michael Meeks (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3687

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/87/3687/1

fdo#62336 - fix horribly coupled table rendering code to not crash.

Change-Id: Ie0c5f39f6265e38534a6d0c9743877eef79e5954
---
M sw/source/filter/writer/wrtswtbl.cxx
1 file changed, 11 insertions(+), 1 deletion(-)



diff --git a/sw/source/filter/writer/wrtswtbl.cxx 
b/sw/source/filter/writer/wrtswtbl.cxx
index 55afa3c..4699005 100644
--- a/sw/source/filter/writer/wrtswtbl.cxx
+++ b/sw/source/filter/writer/wrtswtbl.cxx
@@ -404,6 +404,10 @@
 return !pBox->GetSttNd() && nDepth > 0;
 }
 
+// FIXME: the degree of coupling between this method and
+// FillTableRowsCols which is called immediately afterwards
+// is -extremely- unpleasant and potentially problematic.
+
 void SwWriteTable::CollectTableRowsCols( long nStartRPos,
sal_uInt32 nStartCPos,
long nParentLineHeight,
@@ -747,10 +751,16 @@
 // Erstmal die Tabellen-Struktur festlegen. Hinter der Tabelle ist in
 // jedem Fall eine Spalte zu Ende
 SwWriteTableCol *pCol = new SwWriteTableCol( nParentWidth );
+bUseLayoutHeights = true;
 aCols.insert( pCol );
 CollectTableRowsCols( 0, 0, 0, nParentWidth, rLines, nMaxDepth - 1 );
 
-// Und jetzt mit leben fuellen
+// FIXME: awfully GetLineHeight writes to this in its first call
+// and proceeds to return a rather odd number fdo#62336, we have to
+// behave identically since the code in FillTableRowsCols duplicates
+// and is highly coupled to CollectTableRowsCols - sadly.
+bUseLayoutHeights = true;
+// And now fill with life
 FillTableRowsCols( 0, 0, 0, 0, 0, nParentWidth, rLines, 0, nMaxDepth - 1, 
static_cast< sal_uInt16 >(nNumOfRowsToRepeat) );
 
 // Einige Twip-Werte an Pixel-Grenzen anpassen

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie0c5f39f6265e38534a6d0c9743877eef79e5954
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Michael Meeks 

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

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

[Michael Meeks]

 sw/source/filter/writer/wrtswtbl.cxx |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit 61dc0d2c9d79fd9ce32cd9591fad4daead0ebade
Author: Michael Meeks 
Date:   Mon Apr 29 18:01:25 2013 +0100

fdo#62336 - fix horribly coupled table rendering code to not crash.

Change-Id: I7a6ee4dce338b7529fa7500bb0c8341a4f2ebc22

diff --git a/sw/source/filter/writer/wrtswtbl.cxx 
b/sw/source/filter/writer/wrtswtbl.cxx
index 7a1123d..12c3539 100644
--- a/sw/source/filter/writer/wrtswtbl.cxx
+++ b/sw/source/filter/writer/wrtswtbl.cxx
@@ -396,6 +396,10 @@ sal_Bool SwWriteTable::ShouldExpandSub(const SwTableBox 
*pBox, sal_Bool /*bExpan
 return !pBox->GetSttNd() && nDepth > 0;
 }
 
+// FIXME: the degree of coupling between this method and
+// FillTableRowsCols which is called immediately afterwards
+// is -extremely- unpleasant and potentially problematic.
+
 void SwWriteTable::CollectTableRowsCols( long nStartRPos,
sal_uInt32 nStartCPos,
long nParentLineHeight,
@@ -740,8 +744,14 @@ SwWriteTable::SwWriteTable(const SwTableLines& rLines, 
long nWidth,
 // case the end of a column
 SwWriteTableCol *pCol = new SwWriteTableCol( nParentWidth );
 aCols.insert( pCol );
+bUseLayoutHeights = true;
 CollectTableRowsCols( 0, 0, 0, nParentWidth, rLines, nMaxDepth - 1 );
 
+// FIXME: awfully GetLineHeight writes to this in its first call
+// and proceeds to return a rather odd number fdo#62336, we have to
+// behave identically since the code in FillTableRowsCols duplicates
+// and is highly coupled to CollectTableRowsCols - sadly.
+bUseLayoutHeights = true;
 // And now fill with life
 FillTableRowsCols( 0, 0, 0, 0, 0, nParentWidth, rLines, 0, nMaxDepth - 1, 
static_cast< sal_uInt16 >(nNumOfRowsToRepeat) );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] fdo#33370 Readme file could be easier to follow

[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/3679

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I25794499711845cb8183664d1345e5513587d81c
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Jan Bobisud 
Gerrit-Reviewer: Jan Bobisud 
Gerrit-Reviewer: Tor Lillqvist 

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

[Libreoffice-commits] core.git: readlicense_oo/docs

[Jan Bobisud]

 readlicense_oo/docs/readme.xrm |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit a1f3824e94694433466d492ee16cf497783a3455
Author: Jan Bobisud 
Date:   Mon Apr 29 16:10:41 2013 +0200

fdo#33370 Readme file could be easier to follow

Change-Id: I25794499711845cb8183664d1345e5513587d81c
Reviewed-on: https://gerrit.libreoffice.org/3679
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/readlicense_oo/docs/readme.xrm b/readlicense_oo/docs/readme.xrm
index 0f9f47c..57204c2 100755
--- a/readlicense_oo/docs/readme.xrm
+++ b/readlicense_oo/docs/readme.xrm
@@ -133,12 +133,11 @@
When you unpack 
the downloaded archive, you will see that the contents have been decompressed 
into a sub-directory. Open a file manager window, and change directory to the 
one starting with "LibreOffice_", followed by the version number and some 
platform information.
This directory 
contains a subdirectory called "DEBS". Change directory to the "DEBS" 
directory.
Right-click 
within the directory and choose "Open in Terminal". A terminal window will 
open. From the command line of the terminal window, enter the following command 
(you will be prompted to enter your root user's password before the command 
will execute):
-   sudo dpkg -i 
*.deb
-   The above dpkg 
command does the first part of the installation process. To complete the 
process, you also need to install the desktop integration packages. To do this, 
change directory to the "desktop-integration" directory that is within the 
"DEBS" directory, using the following command:
+   The following 
commands will install LibreOffice and the desktop integration packages (you may 
just copy and paste them into the terminal screen rather than trying to type 
them):
+   sudo dpkg -i 
*.deb
cd 
desktop-integration
-   Now run the 
dpkg command again:
-   sudo dpkg -i 
*.deb
-   The 
installation process is now completed, and you should have icons for all the 
${PRODUCTNAME} applications in your desktop's Applications/Office menu.
+   sudo dpkg -i 
*.deb
+   The 
installation process is now completed, and you should have icons for all the 
${PRODUCTNAME} applications in your desktop's Applications/Office menu.
Installation of 
${PRODUCTNAME} on Fedora, openSUSE, Mandriva and other Linux systems using RPM 
packages
If you have a 
previous version of ${PRODUCTNAME} already installed, then you will need to 
de-install it before proceeding further. For instructions on how to install a 
language pack (after having installed the US English version of 
${PRODUCTNAME}), please read the section below entitled Installing a Language 
Pack.
When you unpack 
the downloaded archive, you will see that the contents have been decompressed 
into a sub-directory. Open a file manager window, and change directory to the 
one starting with "LibreOffice_", followed by the version number and some 
platform information.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - postprocess/CustomTarget_images.mk postprocess/Package_images_install.mk postprocess/Package_images.mk scp2/source vcl/source

[Stephan Bergmann]

 postprocess/CustomTarget_images.mk|6 ---
 postprocess/Package_images.mk |2 -
 postprocess/Package_images_install.mk |1 
 scp2/source/ooo/common_brand.scp  |8 
 vcl/source/gdi/impimagetree.cxx   |   61 --
 5 files changed, 16 insertions(+), 62 deletions(-)

New commits:
commit 8b324e21f2ae4345f41b32e6c4b9c8a658dd5492
Author: Stephan Bergmann 
Date:   Mon Apr 29 18:38:12 2013 +0200

There is no images*_brand.zip files

Change-Id: I6ddeff7ae72693fd0951d71bd7b5444938bc7286

diff --git a/postprocess/CustomTarget_images.mk 
b/postprocess/CustomTarget_images.mk
index e7d08c7..6c59c1f 100644
--- a/postprocess/CustomTarget_images.mk
+++ b/postprocess/CustomTarget_images.mk
@@ -35,7 +35,6 @@ helpimages_DIR := $(call 
gb_CustomTarget_get_workdir,helpcontent2/source/auxilia
 packimages_CUSTOM_FALLBACKS := -c $(SRCDIR)/icon-themes/tango -c 
$(SRCDIR)/icon-themes/industrial
 
 $(eval $(call gb_CustomTarget_register_targets,postprocess/images,\
-   images_brand.zip \
$(if $(filter default,$(WITH_THEMES)),images.zip) \
$(foreach theme,$(filter-out 
default,$(WITH_THEMES)),images_$(theme).zip) \
commandimagelist.ilst \
@@ -68,11 +67,6 @@ $(packimages_DIR)/%.zip : \
-s $< -o $@ \
$(if $(findstring s,$(MAKEFLAGS)),> /dev/null))
 
-# make sure to have one to keep packing happy
-$(packimages_DIR)/images_brand.zip :
-   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),TCH,2)
-   touch $@
-
 # commandimagelist.ilst and sorted.lst are phony to rebuild everything each 
time
 .PHONY : $(packimages_DIR)/commandimagelist.ilst $(packimages_DIR)/sorted.lst
 
diff --git a/postprocess/Package_images.mk b/postprocess/Package_images.mk
index 6d60590..749da1e 100644
--- a/postprocess/Package_images.mk
+++ b/postprocess/Package_images.mk
@@ -27,8 +27,6 @@
 
 $(eval $(call gb_Package_Package,postprocess_images,$(call 
gb_CustomTarget_get_workdir,postprocess/images)))
 
-$(eval $(call 
gb_Package_add_file,postprocess_images,bin/images_brand.zip,images_brand.zip))
-
 $(if $(filter default,$(WITH_THEMES)),\
 $(eval $(call 
gb_Package_add_file,postprocess_images,bin/images.zip,images.zip)))
 
diff --git a/postprocess/Package_images_install.mk 
b/postprocess/Package_images_install.mk
index 1759d6c..af0f269 100644
--- a/postprocess/Package_images_install.mk
+++ b/postprocess/Package_images_install.mk
@@ -12,7 +12,6 @@ $(eval $(call 
gb_Package_Package,postprocess_images_install,$(call gb_CustomTarg
 $(eval $(call gb_Package_set_outdir,postprocess_images_install,$(INSTDIR)))
 
 $(eval $(call gb_Package_add_files,postprocess_images_install,share/config,\
-   images_brand.zip \
$(if $(filter default,$(WITH_THEMES)),images.zip) \
$(foreach theme,$(filter-out 
default,$(WITH_THEMES)),images_$(theme).zip) \
 ))
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 60024a7..c4fe20a 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -61,7 +61,6 @@ Module gid_Module_Root_Brand
  gid_Brand_File_Bin_Libxml2,
  gid_Brand_File_Bmp_IntroAboutShell,
  gid_Brand_File_Html_Thirdpartylicensereadme,
- gid_Brand_File_Images_Brand_Zip,
  gid_Brand_File_Lib_Dbghelp,
  gid_Brand_File_Lib_Mingw_GccS,
  gid_Brand_File_Lib_Mingw_Stdcpp,
@@ -619,13 +618,6 @@ File gid_Brand_File_Bmp_IntroAboutShell
 Styles = (ARCHIVE);
 End
 
-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;
diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx
index 8b45375..7a2fbdd 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.cxx
@@ -163,26 +163,22 @@ bool ImplImageTree::checkStyle(OUString const & style)
 setStyle(style);
 
 exists = false;
-const OUString sBrandURLSuffix("_brand");
 for (Paths::iterator i(m_paths.begin()); i != m_paths.end() && !exists; 
++i) {
 OUString aURL = i->first;
-sal_Int32 nFromIndex = aURL.getLength() - sBrandURLSuffix.getLength();
-// skip brand-specific icon themes; they are incomplete and thus not 
useful for this check
-if (nFromIndex < 0 || !aURL.match(sBrandURLSuffix, nFromIndex)) {
-osl::File aZip(aURL + ".zip");
-if (aZip.open(osl_File_OpenFlag_Read) == ::osl::FileBase::E_None) {
-aZip.close();
-exists = true;
-}
 
-osl::Directory aLookaside(aURL);
-if (aLookaside.open() == ::osl::FileBase::E_None) {
-aLookaside.close();
-exists = true;
-m_cacheIcons = false;
-} el

Re: [PATCH] Rewrite as a static table of keywords and loop over these ke...

[Anthony Youngman]

Hi Lionel,

Thanks very much. Sorry for not doing it myself, my wife's been using
the computer too much :-) And I've been working this morning, I was
hoping to look at it this afternoon - Tor kindly told me how to squash
patches, but I hadn't had a chance to do it.

Hopefully all new work is going to be on a dev system that my wife won't
use :-)

Cheers,
Wol

On 29/04/13 09:22, Lionel Elie Mamane wrote:
> Hi Anthony,
> 
> Thank you for submitting your change through gerrit. I've pushed it to
> master. On gerrit, Tor asked you to please combine all three changes
> into one; the main reason is that these changes are not "meaningful"
> changes by themselves, but the latter two are really "fixes" to the
> first one. It is thus cleaner to "squash" the changes into one.
> 
> I did the "squash" of the three changes into one. Here's how to do it:
> 
> 1) I cherry-picked your changes (since you already have these changes
>in your local tree, you wouldn't have needed to do that):
> 
> user@host:~/src/libreoffice/workdirs/libreoffice-4.1$ git fetch 
> git://gerrit.libreoffice.org/core refs/changes/14/3614/1 && git cherry-pick 
> FETCH_HEAD
> remote: Counting objects: 13, done.
> remote: Compressing objects: 100% (7/7), done.
> remote: Total 7 (delta 6), reused 1 (delta 0)
> Unpacking objects: 100% (7/7), done.
> From git://gerrit.libreoffice.org/core
>  * branchrefs/changes/14/3614/1 -> FETCH_HEAD
> [master 112e852] Rewrite as a static table of keywords and loop over these 
> keywords
>  Author: Wol 
>  1 file changed, 25 insertions(+), 33 deletions(-)
> user@host:~/src/libreoffice/workdirs/libreoffice-4.1$ git fetch 
> git://gerrit.libreoffice.org/core refs/changes/15/3615/1 && git cherry-pick 
> FETCH_HEAD
> remote: Counting objects: 20, done.
> remote: Compressing objects: 100% (12/12), done.
> remote: Total 14 (delta 12), reused 4 (delta 2)
> Unpacking objects: 100% (14/14), done.
> From git://gerrit.libreoffice.org/core
>  * branchrefs/changes/15/3615/1 -> FETCH_HEAD
> [master b997307] Rewrite as a static table of keywords and loop over them
>  Author: Wol 
>  1 file changed, 3 insertions(+), 2 deletions(-)
> user@host:~/src/libreoffice/workdirs/libreoffice-4.1$ git fetch 
> git://gerrit.libreoffice.org/core refs/changes/16/3616/1 && git cherry-pick 
> FETCH_HEAD
> remote: Counting objects: 27, done.
> remote: Compressing objects: 100% (8/8), done.
> remote: Total 21 (delta 17), reused 17 (delta 13)
> Unpacking objects: 100% (21/21), done.
> From git://gerrit.libreoffice.org/core
>  * branchrefs/changes/16/3616/1 -> FETCH_HEAD
> [master fa8cf51] Change j type to size_t
>  Author: Wol 
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> 
> 2) Squash them into one:
> 
> user@host:~/src/libreoffice/workdirs/libreoffice-4.1$ git rebase --interactive
> # I then get in my editor:
> #  pick 112e852 Rewrite as a static table of keywords and loop over these 
> keywords
> #  pick b997307 Rewrite as a static table of keywords and loop over them
> #  pick fa8cf51 Change j type to size_t
> # I change it to:
> #  pick 112e852 Rewrite as a static table of keywords and loop over these 
> keywords
> #  squash b997307 Rewrite as a static table of keywords and loop over them
> #  squash fa8cf51 Change j type to size_t
> # and then close my editor
> #  git proceeds and opens my editor again, with the concatenation of
> #  all three commit messages. I edit it to make one "good" commit
> #  message that covers everything and contains no temporary notes like
> #  "does not compile yet":
> # I kept the "Change-Id" of the first change.
> # close my editor again
> # And I'm done!
> 
> 3) test
> 
> 4) push / submit to gerrit
> 
> 5) congratulate Wols for successful patch! ;-)
> 
> Thanks for the patch!
> 
> On Fri, Apr 26, 2013 at 08:20:49AM +, Anthony Youngman (via Code Review) 
> wrote:
> 
>> I have submitted a patch for review:
> 
>> https://gerrit.libreoffice.org/3614
> 
>> Rewrite as a static table of keywords and loop over these keywords
> 
>> It currently contains a compile error - the call the 
>> matchIgnoreAsciiCaseAsciiL
>> fails.
> 
> On Fri, Apr 26, 2013 at 08:20:52AM +, Anthony Youngman (via Code Review) 
> wrote:
> 
>> I have submitted a patch for review:
> 
>> https://gerrit.libreoffice.org/3615
> 
>> Rewrite as a static table of keywords and loop over them
> On Fri, Apr 26, 2013 at 08:20:54AM +, Anthony Youngman (via Code Review) 
> wrote:
> 
>> I have submitted a patch for review:
> 
>> https://gerrit.libreoffice.org/3616
> 
>> Change j type to size_t
> 

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

Re: [Cygwin] [Master] failure when compiling liblangtag

[Eike Rathke]

Hi,

On Tuesday, 2013-04-16 15:44:28 +0200, Eike Rathke wrote:

> Cc'ing Peter Foley who did the gcc-wrapper.

We now have the same failure with an upgrade to liblangtag-0.5.0, see
https://gerrit.libreoffice.org/3676 and the error log
https://ci.libreoffice.org/job/buildbot/663

Peter, what's going wrong there?

  Eike

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


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

Re: Need Guidance on bug fdo#37222

[Tomaž Vajngerl]

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 wrote:

> Hi,
>
> Thank you for the reply,
>
> Well i used,
>
>
> Reference
> 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  wrote:
>
>> Hi,
>>
>> system("xdg-open abc.pdf"); is not good enough - this won't work on OSX
>> or Windows.
>>
>> You have to use XSystemShellExecute:
>> Reference
>> 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 
>> 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

[PATCH libreoffice-4-0] c:varyColor is true by default in Excel

[Markus Mohrhard (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3686

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/86/3686/1

c:varyColor is true by default in Excel

And another step closer to opening my test file correctly in Excel.

Change-Id: Ib6aa8ddb2f2792513c7263d86865e08fe5f1483d
(cherry picked from commit 81b9d431678bc270e7592e9bedb81d2d445e2122)
---
M oox/source/export/chartexport.cxx
1 file changed, 4 insertions(+), 0 deletions(-)



diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index 37abe5d..745b953 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1341,6 +1341,10 @@
 XML_val, scatterStyle,
 FSEND );
 
+pFS->singleElement( FSNS( XML_c, XML_varyColors ),
+XML_val, "0",
+FSEND );
+
 // FIXME: should export xVal and yVal
 sal_Int32 nAttachedAxis = AXIS_PRIMARY_Y;
 exportSeries( xChartType, nAttachedAxis );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib6aa8ddb2f2792513c7263d86865e08fe5f1483d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Markus Mohrhard 

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

[PATCH libreoffice-4-0] c:delete is true by default in Excel

[Markus Mohrhard (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3685

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/85/3685/1

c:delete is true by default in Excel

One step closer to opening my simple test file correctly in Excel.

Change-Id: I1bfa76a46081ba478e44d8d90d8a91790a9a9ff3
(cherry picked from commit 6ddd7fccdc8fc292200e581dbc4e456ec86cef47)
---
M oox/source/export/chartexport.cxx
1 file changed, 2 insertions(+), 6 deletions(-)



diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index 37abe5d..138c469 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -2084,13 +2084,9 @@
 OUString ("Visible")) >>=  bVisible;
 }
 
-if( !bVisible )
-{
-// other value?
-pFS->singleElement( FSNS( XML_c, XML_delete ),
-XML_val, "1",
+pFS->singleElement( FSNS( XML_c, XML_delete ),
+XML_val, bVisible ? "0" : "1",
 FSEND );
-}
 
 // FIXME: axPos, need to check the property "ReverseDirection"
 pFS->singleElement( FSNS( XML_c, XML_axPos ),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1bfa76a46081ba478e44d8d90d8a91790a9a9ff3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Markus Mohrhard 

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

[ABANDONED] c:delete is true by default in Excel

[Markus Mohrhard (via Code Review)]

Markus Mohrhard has abandoned this change.

Change subject: c:delete is true by default in Excel
..


Patch Set 1: Abandoned

should have gone to libreoffice-4-0

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: I1bfa76a46081ba478e44d8d90d8a91790a9a9ff3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Markus Mohrhard 

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

[ABANDONED] c:varyColor is true by default in Excel

[Markus Mohrhard (via Code Review)]

Markus Mohrhard has abandoned this change.

Change subject: c:varyColor is true by default in Excel
..


Patch Set 1: Abandoned

should have gone to libreoffice-4-0

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: Ib6aa8ddb2f2792513c7263d86865e08fe5f1483d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Markus Mohrhard 

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

[PATCH] c:delete is true by default in Excel

[Markus Mohrhard (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3684

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/84/3684/1

c:delete is true by default in Excel

One step closer to opening my simple test file correctly in Excel.

Change-Id: I1bfa76a46081ba478e44d8d90d8a91790a9a9ff3
(cherry picked from commit 6ddd7fccdc8fc292200e581dbc4e456ec86cef47)
---
M oox/source/export/chartexport.cxx
1 file changed, 2 insertions(+), 6 deletions(-)



diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index 745b953..9cb85db 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -2088,13 +2088,9 @@
 OUString ("Visible")) >>=  bVisible;
 }
 
-if( !bVisible )
-{
-// other value?
-pFS->singleElement( FSNS( XML_c, XML_delete ),
-XML_val, "1",
+pFS->singleElement( FSNS( XML_c, XML_delete ),
+XML_val, bVisible ? "0" : "1",
 FSEND );
-}
 
 // FIXME: axPos, need to check the property "ReverseDirection"
 pFS->singleElement( FSNS( XML_c, XML_axPos ),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1bfa76a46081ba478e44d8d90d8a91790a9a9ff3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Markus Mohrhard 

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

[PATCH] c:varyColor is true by default in Excel

[Markus Mohrhard (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3683

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/83/3683/1

c:varyColor is true by default in Excel

And another step closer to opening my test file correctly in Excel.

Change-Id: Ib6aa8ddb2f2792513c7263d86865e08fe5f1483d
(cherry picked from commit 81b9d431678bc270e7592e9bedb81d2d445e2122)
---
M oox/source/export/chartexport.cxx
1 file changed, 4 insertions(+), 0 deletions(-)



diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index 37abe5d..745b953 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1341,6 +1341,10 @@
 XML_val, scatterStyle,
 FSEND );
 
+pFS->singleElement( FSNS( XML_c, XML_varyColors ),
+XML_val, "0",
+FSEND );
+
 // FIXME: should export xVal and yVal
 sal_Int32 nAttachedAxis = AXIS_PRIMARY_Y;
 exportSeries( xChartType, nAttachedAxis );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib6aa8ddb2f2792513c7263d86865e08fe5f1483d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Markus Mohrhard 

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

[PATCH] fdo#60949: Remove last UNOLIBS_OOO

[Marcos Souza (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3682

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/82/3682/1

fdo#60949: Remove last UNOLIBS_OOO

Change-Id: I79af32f188a0e7de71ec8e6743fe73b3bb030a3f
---
M Repository.mk
1 file changed, 8 insertions(+), 11 deletions(-)



diff --git a/Repository.mk b/Repository.mk
index 296ffc8..76d6662 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -225,6 +225,7 @@
 chartcore \
 chartcontroller \
 cppcanvas \
+configmgr \
 ctl \
 cui \
 dba \
@@ -232,8 +233,9 @@
 dbmm \
 $(if $(DISABLE_DBCONNECTIVITY),,dbtools) \
 dbaxml \
-   deploymentmisc \
-   $(if $(filter unx,$(GUIBASE)),desktop_detector) \
+deploymentmisc \
+$(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
+$(if $(filter unx,$(GUIBASE)),desktop_detector) \
 drawinglayer \
 editeng \
 egi \
@@ -252,12 +254,14 @@
 for \
 forui \
 frm \
+fsstorage \
 fwe \
fwi \
 fwk \
 fwl \
fwm \
 $(if $(filter DESKTOP,$(BUILD_TYPE)),helplinker) \
+i18npool \
 icd \
 icg \
 idx \
@@ -270,6 +274,7 @@
 ira \
 itg \
 iti \
+localebe1 \
 lng \
 $(if $(MERGELIBS),merged) \
 msfilter \
@@ -289,6 +294,7 @@
 tk \
 tl \
$(if $(ENABLE_TELEPATHY),tubes) \
+ucpexpand1 \
 unordf \
 unoxml \
 utl \
@@ -632,15 +638,6 @@
 smplmail \
 wininetbe1 \
 ) \
-))
-
-$(eval $(call gb_Helper_register_libraries_for_install,UNOLIBS_OOO,OOO, \
-   configmgr \
-   $(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
-   fsstorage \
-   i18npool \
-   localebe1 \
-   ucpexpand1 \
 ))
 
 $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I79af32f188a0e7de71ec8e6743fe73b3bb030a3f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza 

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

[PUSHED] add fallback for Merge-Modules directory (when not found in ...

[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/3680

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I16f58b8a1d453c8628c6eb66c2cea37ab3da913a
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christian Lohmaier 
Gerrit-Reviewer: Tor Lillqvist 

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

[Libreoffice-commits] core.git: configure.ac

[Christian Lohmaier]

 configure.ac |4 
 1 file changed, 4 insertions(+)

New commits:
commit 2f205ee79ea929c6fce5686512bd468ab78a877a
Author: Christian Lohmaier 
Date:   Mon Apr 29 16:48:57 2013 +0200

add fallback for Merge-Modules directory (when not found in registry)

Add "$COMMONPROGRAMFILES\Merge Modules" (on current versions of Windows
that probably is "C:\Program Files (x86)\Common Files\Merge Modules") as
fallback, since for example on Windows Server 2012, the registry entry
has not been created when installing Visual Studio Express

Change-Id: I16f58b8a1d453c8628c6eb66c2cea37ab3da913a
Reviewed-on: https://gerrit.libreoffice.org/3680
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/configure.ac b/configure.ac
index 312998b..bc20dec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4808,6 +4808,10 @@ find_msms()
 fi
 fi
 done
+if test -z "$msmdir"; then
+AC_MSG_NOTICE([no registry entry for Merge Module directory - trying 
"$COMMONPROGRAMFILES\Merge Modules"])
+msmdir="$COMMONPROGRAMFILES\Merge Modules"
+fi
 msmdir=`cygpath -d "$msmdir"`
 msmdir=`cygpath -u "$msmdir"`
 if test -z "$msmdir"; then
___
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' - formula/Library_for.mk formula/source include/formula

[Kohei Yoshida]

 formula/Library_for.mk  |1 
 formula/source/core/api/vectortoken.cxx |   37 +++
 include/formula/token.hxx   |2 +
 include/formula/vectortoken.hxx |   60 
 4 files changed, 100 insertions(+)

New commits:
commit 445dfb5419fd794309326d62a988718ad91a41ee
Author: Kohei Yoshida 
Date:   Mon Apr 29 11:18:54 2013 -0400

Initial cut on vector formula ref tokens. Not used yet.

Change-Id: I4b28c269759bc01bfc94cfdd6a1c651d03d829c7

diff --git a/formula/Library_for.mk b/formula/Library_for.mk
index 52e157f..832d7cd 100644
--- a/formula/Library_for.mk
+++ b/formula/Library_for.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_Library_add_exception_objects,for,\
 formula/source/core/api/FormulaOpCodeMapperObj \
 formula/source/core/api/services \
 formula/source/core/api/token \
+formula/source/core/api/vectortoken \
 formula/source/core/resource/core_resource \
 ))
 
diff --git a/formula/source/core/api/vectortoken.cxx 
b/formula/source/core/api/vectortoken.cxx
new file mode 100644
index 000..b7cab77
--- /dev/null
+++ b/formula/source/core/api/vectortoken.cxx
@@ -0,0 +1,37 @@
+/* -*- 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 "formula/vectortoken.hxx"
+
+namespace formula {
+
+VectorArray::VectorArray( const double* pArray, size_t nLength ) :
+mpArray(pArray), mnLength(nLength) {}
+
+SingleVectorRefToken::SingleVectorRefToken( const double* pArray, size_t 
nLength ) :
+FormulaToken(svSingleVectorRef, ocPush), maArray(pArray, nLength) {}
+
+const VectorArray& SingleVectorRefToken::GetArray() const
+{
+return maArray;
+}
+
+DoubleVectorRefToken::DoubleVectorRefToken(
+const std::vector& rArrays, size_t nColSize, size_t nRowSize, 
bool bAbsStart, bool bAbsEnd ) :
+FormulaToken(svDoubleVectorRef, ocPush),
+maArrays(rArrays), mnColSize(nColSize), mnRowSize(nRowSize), 
mbAbsStart(bAbsStart), mbAbsEnd(bAbsEnd) {}
+
+const std::vector& DoubleVectorRefToken::GetArrays() const
+{
+return maArrays;
+}
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/formula/token.hxx b/include/formula/token.hxx
index 82bdf7f..c7fa0cd 100644
--- a/include/formula/token.hxx
+++ b/include/formula/token.hxx
@@ -63,6 +63,8 @@ enum StackVarEnum
 svExternalSingleRef,
 svExternalDoubleRef,
 svExternalName,
+svSingleVectorRef,
+svDoubleVectorRef,
 svSubroutine,   // A token with a subroutine token 
array.
 svError,// error token
 svMissing = 0x70,   // 0 or ""
diff --git a/include/formula/vectortoken.hxx b/include/formula/vectortoken.hxx
new file mode 100644
index 000..5af2690
--- /dev/null
+++ b/include/formula/vectortoken.hxx
@@ -0,0 +1,60 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef FORMULA_VECTORTOKEN_HXX
+#define FORMULA_VECTORTOKEN_HXX
+
+#include "formula/token.hxx"
+
+namespace formula {
+
+struct VectorArray
+{
+const double* mpArray;
+size_t mnLength;
+
+VectorArray( const double* pArray, size_t nLength );
+};
+
+class FORMULA_DLLPUBLIC SingleVectorRefToken : public FormulaToken
+{
+const VectorArray maArray;
+public:
+SingleVectorRefToken( const double* pArray, size_t nLength );
+
+const VectorArray& GetArray() const;
+};
+
+/**
+ * This token describes a range reference in a vectorized formula
+ * calculation context.
+ */
+class FORMULA_DLLPUBLIC DoubleVectorRefToken : public FormulaToken
+{
+std::vector maArrays;
+
+size_t mnColSize;
+size_t mnRowSize;
+
+bool mbAbsStart:1; /// whether or not the start row position is absolute.
+bool mbAbsEnd:1; /// whether or not the end row position is absolute.
+
+public:
+DoubleVectorRefToken(
+const std::vector& rArrays, size_t nColSize, size_t 
nRowSize,
+bool bAbsStart, bool bAbsEnd );
+
+const std::vector& GetArrays() const;
+};
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[ABANDONED] fdo#46808, Convert some XMultiServiceFactory to XComponentCo...

[Noel Grandin (via Code Review)]

Noel Grandin has abandoned this change.

Change subject: fdo#46808, Convert some XMultiServiceFactory to 
XComponentContext
..


Patch Set 1: Abandoned

This got somehow mixed up with another change.

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: I1dcfee9fa0fdc4457754396ffb52cc8462f3906a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Noel Grandin 

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

[PATCH] fdo#46808, Convert some XMultiServiceFactory to XComponentCo...

[Noel Grandin (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3681

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/81/3681/1

fdo#46808, Convert some XMultiServiceFactory to XComponentContext

The new constructor is not happy with forward declarations of types
so I need to updates lots of files to include the necessary headers.

Change-Id: I1dcfee9fa0fdc4457754396ffb52cc8462f3906a
---
M accessibility/source/extended/accessibletabbar.cxx
M accessibility/source/standard/accessiblemenucomponent.cxx
M basctl/source/basicide/baside2b.cxx
M canvas/source/tools/canvastools.cxx
M chart2/source/controller/dialogs/tp_DataSource.cxx
M connectivity/source/commontools/dbtools2.cxx
M dbaccess/source/ui/control/sqledit.cxx
M dbaccess/source/ui/dlg/UserAdmin.cxx
M dbaccess/source/ui/dlg/adminpages.cxx
M desktop/source/deployment/registry/dp_backend.cxx
M extensions/source/propctrlr/formlinkdialog.cxx
M filter/source/msfilter/msocximex.cxx
M forms/source/runtime/formoperations.cxx
M fpicker/source/generic/fpicker.cxx
M include/com/sun/star/uno/Reference.h
M oox/source/core/xmlfilterbase.cxx
M oox/source/drawingml/chart/converterbase.cxx
M oox/source/drawingml/chart/objectformatter.cxx
M oox/source/drawingml/chart/typegroupconverter.cxx
M oox/source/vml/vmltextbox.cxx
M reportdesign/inc/RptDef.hxx
M reportdesign/source/core/api/FormattedField.cxx
M reportdesign/source/core/sdr/RptObject.cxx
M reportdesign/source/filter/xml/xmlExport.cxx
M sc/source/core/tool/chartlock.cxx
M sc/source/filter/inc/workbookhelper.hxx
M sc/source/filter/inc/xlchart.hxx
M sc/source/filter/oox/excelchartconverter.cxx
M sc/source/filter/xcl97/xcl97esc.cxx
M sc/source/filter/xml/xmlstyle.cxx
M sc/source/ui/vba/vbasheetobjects.hxx
M sd/source/core/CustomAnimationEffect.cxx
M sd/source/ui/framework/factories/Pane.cxx
M sd/source/ui/toolpanel/ToolPanel.cxx
M sfx2/source/control/templatelocalview.cxx
M sfx2/source/doc/Metadatable.cxx
M sfx2/source/doc/iframe.cxx
M sfx2/source/view/sfxbasecontroller.cxx
M slideshow/source/engine/rehearsetimingsactivity.cxx
M svtools/source/brwbox/brwimpl.hxx
M svtools/source/uno/wizard/unowizard.cxx
M svx/source/form/fmmodel.cxx
M sw/source/ui/docvw/srcedtw.cxx
M writerfilter/source/ooxml/OOXMLStreamImpl.cxx
M xmloff/source/text/XMLTextNumRuleInfo.cxx
M xmloff/source/xforms/xformsapi.cxx
46 files changed, 72 insertions(+), 11 deletions(-)



diff --git a/accessibility/source/extended/accessibletabbar.cxx 
b/accessibility/source/extended/accessibletabbar.cxx
index 8e1730b..8c318f5 100644
--- a/accessibility/source/extended/accessibletabbar.cxx
+++ b/accessibility/source/extended/accessibletabbar.cxx
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/accessibility/source/standard/accessiblemenucomponent.cxx 
b/accessibility/source/standard/accessiblemenucomponent.cxx
index 3bf4d15..c7e12a6 100644
--- a/accessibility/source/standard/accessiblemenucomponent.cxx
+++ b/accessibility/source/standard/accessiblemenucomponent.cxx
@@ -25,6 +25,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index 7b7e3c7..e4579aa 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/canvas/source/tools/canvastools.cxx 
b/canvas/source/tools/canvastools.cxx
index 26775be..cba537b 100644
--- a/canvas/source/tools/canvastools.cxx
+++ b/canvas/source/tools/canvastools.cxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx 
b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 13a2fe4..d11ee84 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -34,6 +34,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
diff --git a/connectivity/source/commontools/dbtools2.cxx 
b/connectivity/source/commontools/dbtools2.cxx
index df243d3..d2981ef 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -28,6 +28,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/dbaccess/source/ui/control/sqledit.cxx 
b/dbaccess/source/ui/control/sqledit.cxx
index 11446c9..6800f02 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -23,6 +23,7 @@
 
 #include "com/sun/star/beans/XMultiPropertySet.hpp"
 #include "com/sun/star/beans/XPropertiesChangeListener.hpp"
+#include "com/sun/star/container/XHierarchicalNameAccess.hpp"
 #include "officecfg/Office/Common.hxx"
 #include "sqledit.hxx"
 #include "QueryTextView.hxx"
diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx 
b/dbac

[Libreoffice-commits] dictionaries.git: Dictionary_en.mk Dictionary_hu.mk Dictionary_pt-BR.mk Dictionary_ru.mk en/Lightproof.components en/Lightproof.py en/META-INF hu_HU/Lightproof.components hu_HU/L

[Stephan Bergmann]

 Dictionary_en.mk|1 +
 Dictionary_hu.mk|1 +
 Dictionary_pt-BR.mk |1 +
 Dictionary_ru.mk|1 +
 en/Lightproof.components|   18 ++
 en/Lightproof.py|4 ++--
 en/META-INF/manifest.xml|4 ++--
 hu_HU/Lightproof.components |   18 ++
 hu_HU/Lightproof.py |4 ++--
 hu_HU/META-INF/manifest.xml |4 ++--
 pt_BR/Lightproof.components |   18 ++
 pt_BR/Lightproof.py |7 ---
 pt_BR/META-INF/manifest.xml |2 +-
 ru_RU/Lightproof.components |   18 ++
 ru_RU/Lightproof.py |4 ++--
 ru_RU/META-INF/manifest.xml |4 ++--
 16 files changed, 93 insertions(+), 16 deletions(-)

New commits:
commit acf0ae3fdec65df75f4983d2b943582f9ab99fa2
Author: Stephan Bergmann 
Date:   Mon Apr 29 17:01:07 2013 +0200

Fix passiv'ization of Lightproof.py UNO components

...and some light clean up.

Change-Id: I33da2fa452557d9c8c22419fafdc9d221859c320

diff --git a/Dictionary_en.mk b/Dictionary_en.mk
index 48855c2..8630f42 100644
--- a/Dictionary_en.mk
+++ b/Dictionary_en.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_Dictionary_add_root_files,dict-en,\
dictionaries/en/hyph_en_GB.dic \
dictionaries/en/hyph_en_US.dic \
dictionaries/en/license.txt \
+   dictionaries/en/Lightproof.components \
dictionaries/en/Lightproof.py \
dictionaries/en/Linguistic.xcu \
dictionaries/en/README_en_AU.txt \
diff --git a/Dictionary_hu.mk b/Dictionary_hu.mk
index bb35233..7a52e59 100644
--- a/Dictionary_hu.mk
+++ b/Dictionary_hu.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_Dictionary_add_root_files,dict-hu,\
dictionaries/hu_HU/hu_HU.aff \
dictionaries/hu_HU/hu_HU.dic \
dictionaries/hu_HU/hyph_hu_HU.dic \
+   dictionaries/hu_HU/Lightproof.components \
dictionaries/hu_HU/Lightproof.py \
dictionaries/hu_HU/Linguistic.xcu \
dictionaries/hu_HU/README_hu_HU.txt \
diff --git a/Dictionary_pt-BR.mk b/Dictionary_pt-BR.mk
index 1d8e83b..769b7e8 100644
--- a/Dictionary_pt-BR.mk
+++ b/Dictionary_pt-BR.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_Dictionary_add_root_files,dict-pt-BR,\
 dictionaries/pt_BR/hyph_pt_BR.dic \
 dictionaries/pt_BR/pt_BR.aff \
 dictionaries/pt_BR/pt_BR.dic \
+dictionaries/pt_BR/Lightproof.components \
 dictionaries/pt_BR/Lightproof.py \
 dictionaries/pt_BR/Linguistic.xcu \
 dictionaries/pt_BR/README_Lightproof_pt_BR.txt \
diff --git a/Dictionary_ru.mk b/Dictionary_ru.mk
index 8c925c4..b2b42f9 100644
--- a/Dictionary_ru.mk
+++ b/Dictionary_ru.mk
@@ -11,6 +11,7 @@ $(eval $(call 
gb_Dictionary_Dictionary,dict-ru,dictionaries/ru_RU))
 
 $(eval $(call gb_Dictionary_add_root_files,dict-ru,\
dictionaries/ru_RU/hyph_ru_RU.dic \
+   dictionaries/ru_RU/Lightproof.components \
dictionaries/ru_RU/Lightproof.py \
dictionaries/ru_RU/Linguistic.xcu \
dictionaries/ru_RU/README_Lightproof_ru_RU.txt \
diff --git a/en/Lightproof.components b/en/Lightproof.components
new file mode 100644
index 000..8c3446f
--- /dev/null
+++ b/en/Lightproof.components
@@ -0,0 +1,18 @@
+
+
+http://openoffice.org/2010/uno-components";>
+  
+
+  
+
+
+  
+
diff --git a/en/Lightproof.py b/en/Lightproof.py
index dae4b20..e2974fd 100644
--- a/en/Lightproof.py
+++ b/en/Lightproof.py
@@ -148,8 +148,8 @@ class Lightproof( unohelper.Base, XProofreader, 
XServiceInfo, XServiceName, XSer
 g_ImplementationHelper = unohelper.ImplementationHelper()
 g_ImplementationHelper.addImplementation( Lightproof, \
 "org.libreoffice.comp.pyuno.Lightproof." + pkg,
-("com.sun.star.linguistic2.Proofreader",),)
+("com.sun.star.linguistic2.Proofreader",))
 
 g_ImplementationHelper.addImplementation( 
lightproof_handler_en.LightproofOptionsEventHandler, \
 "org.libreoffice.comp.pyuno.LightproofOptionsEventHandler." + pkg,
-("com.sun.star.awt.XContainerWindowEventHandler",),)
+())
diff --git a/en/META-INF/manifest.xml b/en/META-INF/manifest.xml
index 9a1b9c3..f8d630a 100644
--- a/en/META-INF/manifest.xml
+++ b/en/META-INF/manifest.xml
@@ -7,8 +7,8 @@
 
manifest:media-type="application/vnd.sun.star.configuration-schema" />
 
-
+
 
diff --git a/hu_HU/Lightproof.components b/hu_HU/Lightproof.components
new file mode 100644
index 000..7af6868
--- /dev/null
+++ b/hu_HU/Lightproof.components
@@ -0,0 +1,18 @@
+
+
+http://openoffice.org/2010/uno-components";>
+  
+
+  
+
+
+  
+
diff --git a/hu_HU/Lightproof.py b/hu_HU/Lightproof.py
index 45368ee..74af535 100644
--- a/hu_HU/Lightproof.py
+++ b/hu_HU/Lightproof.py
@@ -148,8 +148,8 @@ class Lightproof( unohelper.Base, XProofreader, 
XServiceInfo, XServiceName, XSer
 g_ImplementationHelper = unohelper.ImplementationHelper()
 g_ImplementationHelper.addImplementation( Lightproof, \
 "org.libreoffice.comp.pyuno.Lightproof."

[Libreoffice-commits] core.git: dictionaries

[Stephan Bergmann]

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

New commits:
commit 9fa0ce282f808fb68ed7a5e29e8052dc3af74119
Author: Stephan Bergmann 
Date:   Mon Apr 29 17:01:07 2013 +0200

Updated core
Project: dictionaries  acf0ae3fdec65df75f4983d2b943582f9ab99fa2

diff --git a/dictionaries b/dictionaries
index 36a0d3a..acf0ae3 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 36a0d3a959604b5c5af4adb17ca10a1d85542846
+Subproject commit acf0ae3fdec65df75f4983d2b943582f9ab99fa2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Luboš Luňák]

 sw/source/core/layout/atrfrm.cxx |  111 +++
 1 file changed, 10 insertions(+), 101 deletions(-)

New commits:
commit 9023c8e6043dbcb815339c8eaa8d736c3575d085
Author: Luboš Luňák 
Date:   Mon Apr 29 16:00:42 2013 +0200

remove demented code

The things are not even enums, so there's no error checking either.

Change-Id: Ib33cd96b49a840cbe486dbed9a7c370827b54c2d

diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 5bd0c2d..cf5a03e 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -111,49 +111,12 @@ TYPEINIT2(SwFmtFooter,  SfxPoolItem, SwClient );
 TYPEINIT2(SwFmtPageDesc,  SfxPoolItem, SwClient );
 TYPEINIT1_AUTOFACTORY(SwFmtLineNumber, SfxPoolItem);
 
-/* --
- *  Conversation for QueryValue
- * --*/
-static sal_Int16 lcl_RelToINT(sal_Int16 eRelation)
-{
-sal_Int16 nRet = text::RelOrientation::FRAME;
-switch(eRelation)
-{
-case  text::RelOrientation::PRINT_AREA:   nRet = 
text::RelOrientation::PRINT_AREA; break;
-case  text::RelOrientation::CHAR: nRet = 
text::RelOrientation::CHAR; break;
-case  text::RelOrientation::PAGE_LEFT:nRet = 
text::RelOrientation::PAGE_LEFT; break;
-case  text::RelOrientation::PAGE_RIGHT:   nRet = 
text::RelOrientation::PAGE_RIGHT; break;
-case  text::RelOrientation::FRAME_LEFT:   nRet = 
text::RelOrientation::FRAME_LEFT; break;
-case  text::RelOrientation::FRAME_RIGHT:  nRet = 
text::RelOrientation::FRAME_RIGHT; break;
-case  text::RelOrientation::PAGE_FRAME:   nRet = 
text::RelOrientation::PAGE_FRAME; break;
-case  text::RelOrientation::PAGE_PRINT_AREA:  nRet = 
text::RelOrientation::PAGE_PRINT_AREA; break;
-// OD 13.11.2003 #i22341#
-case  text::RelOrientation::TEXT_LINE:nRet = 
text::RelOrientation::TEXT_LINE; break;
-default: break;
-}
-return nRet;
-}
-
 static sal_Int16 lcl_IntToRelation(const uno::Any& rVal)
 {
-sal_Int16 eRet = text::RelOrientation::FRAME;
-sal_Int16 nVal = 0;
+sal_Int16 nVal = text::RelOrientation::FRAME;
 if (!(rVal >>= nVal))
 SAL_WARN("sw.core", "lcl_IntToRelation: read from Any failed!");
-switch(nVal)
-{
-case  text::RelOrientation::PRINT_AREA: eRet =   
text::RelOrientation::PRINT_AREA   ; break;
-case  text::RelOrientation::CHAR:   eRet =   
text::RelOrientation::CHAR  ; break;
-case  text::RelOrientation::PAGE_LEFT:  eRet =   
text::RelOrientation::PAGE_LEFT   ; break;
-case  text::RelOrientation::PAGE_RIGHT: eRet =   
text::RelOrientation::PAGE_RIGHT  ; break;
-case  text::RelOrientation::FRAME_LEFT: eRet =   
text::RelOrientation::FRAME_LEFT  ; break;
-case  text::RelOrientation::FRAME_RIGHT:eRet =   
text::RelOrientation::FRAME_RIGHT ; break;
-case  text::RelOrientation::PAGE_FRAME: eRet =   
text::RelOrientation::PAGE_FRAME  ; break;
-case  text::RelOrientation::PAGE_PRINT_AREA:eRet =   
text::RelOrientation::PAGE_PRINT_AREA; break;
-// OD 13.11.2003 #i22341#
-case  text::RelOrientation::TEXT_LINE: eRet = 
text::RelOrientation::TEXT_LINE; break;
-}
-return eRet;
+return nVal;
 }
 
 void DelHFFormat( SwClient *pToRemove, SwFrmFmt *pFmt )
@@ -1280,25 +1243,11 @@ bool SwFmtVertOrient::QueryValue( uno::Any& rVal, 
sal_uInt8 nMemberId ) const
 {
 case MID_VERTORIENT_ORIENT:
 {
-sal_Int16 nRet = text::VertOrientation::NONE;
-switch( eOrient )
-{
-case text::VertOrientation::TOP:  nRet = 
text::VertOrientation::TOP;break;
-case text::VertOrientation::CENTER :  nRet = 
text::VertOrientation::CENTER ;break;
-case text::VertOrientation::BOTTOM :  nRet = 
text::VertOrientation::BOTTOM ;break;
-case text::VertOrientation::CHAR_TOP   :  nRet = 
text::VertOrientation::CHAR_TOP   ;break;
-case text::VertOrientation::CHAR_CENTER:  nRet = 
text::VertOrientation::CHAR_CENTER;break;
-case text::VertOrientation::CHAR_BOTTOM:  nRet = 
text::VertOrientation::CHAR_BOTTOM;break;
-case text::VertOrientation::LINE_TOP   :  nRet = 
text::VertOrientation::LINE_TOP   ;break;
-case text::VertOrientation::LINE_CENTER:  nRet = 
text::VertOrientation::LINE_CENTER;break;
-case text::VertOrientation::LINE_BOTTOM:  nRet = 
text::VertOrientation::LINE_BOTTOM;break;
-default: break;
-}
-rVal <<= nRet;
+rVal <<= (sal_Int16)eOrient;
 }
 break;
 case MID_VERTORIENT_RELATION:
-rVal <<= lcl_RelToINT(eRelation);
+  

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

[Noel Power]

 oovbaapi/ooo/vba/excel/XRange.idl |2 +
 sc/source/ui/vba/vbarange.cxx |   52 ++
 sc/source/ui/vba/vbarange.hxx |1 
 3 files changed, 55 insertions(+)

New commits:
commit 56961599abffcb60fe405fa0e6c62dfe9bc22156
Author: Noel Power 
Date:   Mon Apr 29 14:53:09 2013 +0100

implement Range.Name

Change-Id: I884f84e437dad9440951e60c8f92fd6487c48832

diff --git a/oovbaapi/ooo/vba/excel/XRange.idl 
b/oovbaapi/ooo/vba/excel/XRange.idl
index 5125ea6..eff93ee 100644
--- a/oovbaapi/ooo/vba/excel/XRange.idl
+++ b/oovbaapi/ooo/vba/excel/XRange.idl
@@ -43,6 +43,7 @@ interface XCharacters;
 interface XBorders;
 interface XValidation;
 interface XWorksheet;
+interface XName;
 
 interface XRange
 {
@@ -68,6 +69,7 @@ interface XRange
 [attribute] any ColumnWidth;
 [attribute, readonly ] any Width;
 [attribute, readonly] XWorksheet Worksheet;
+[attribute, readonly] XName Name;
 [attribute] any RowHeight;
 [attribute, readonly ] any Height;
 [attribute, readonly ] any Top;
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 63d0ad6..5fddd01 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -161,6 +161,7 @@
 
 #include "vbaglobals.hxx"
 #include "vbastyle.hxx"
+#include "vbaname.hxx"
 #include 
 #include 
 // begin test includes
@@ -4096,6 +4097,57 @@ ScVbaRange::getTop() throw (uno::RuntimeException)
 return uno::makeAny( lcl_hmmToPoints( aPoint.Y ) );
 }
 
+
+uno::Reference< sheet::XCellRangeReferrer > getNamedRange( const 
uno::Reference< uno::XInterface >& xIf, const uno::Reference< table::XCellRange 
>& thisRange )
+{
+uno::Reference< beans::XPropertySet > xProps( xIf, uno::UNO_QUERY_THROW );
+uno::Reference< container::XNameAccess > xNameAccess( 
xProps->getPropertyValue( "NamedRanges" ), uno::UNO_QUERY_THROW );
+
+uno::Sequence< OUString > sNames = xNameAccess->getElementNames();
+//uno::Reference< table::XCellRange > thisRange( getCellRange(), 
uno::UNO_QUERY_THROW );
+uno::Reference< sheet::XCellRangeReferrer > xNamedRange;
+for ( sal_Int32 i=0; i < sNames.getLength(); ++i )
+{
+uno::Reference< sheet::XCellRangeReferrer > xName( 
xNameAccess->getByName( sNames[ i ] ), uno::UNO_QUERY );
+if ( xName.is() )
+{
+if ( thisRange == xName->getReferredCells() )
+{
+xNamedRange = xName;
+break;
+}
+}
+}
+return xNamedRange;
+}
+
+uno::Reference< excel::XName >
+ScVbaRange::getName() throw (uno::RuntimeException)
+{
+uno::Reference< beans::XPropertySet > xProps( getUnoModel(), 
uno::UNO_QUERY );
+uno::Reference< table::XCellRange > thisRange( getCellRange(), 
uno::UNO_QUERY_THROW );
+// Application range
+uno::Reference< sheet::XCellRangeReferrer > xNamedRange = getNamedRange( 
xProps, thisRange );
+
+if ( !xNamedRange.is() )
+{
+// not in application range then assume it might be in
+// sheet namedranges
+RangeHelper aRange( thisRange );
+uno::Reference< sheet::XSpreadsheet > xSheet = aRange.getSpreadSheet();
+xProps.set( xSheet, uno::UNO_QUERY );
+// impl here
+xNamedRange = getNamedRange( xProps, thisRange );
+}
+if ( xProps.is() && xNamedRange.is() )
+{
+uno::Reference< sheet::XNamedRanges > xNamedRanges( xProps, 
uno::UNO_QUERY_THROW );
+uno::Reference< sheet::XNamedRange > xName( xNamedRange, 
uno::UNO_QUERY_THROW );
+return new ScVbaName( mxParent, mxContext, xName, xNamedRanges, 
getUnoModel() );
+}
+return uno::Reference< excel::XName >();
+}
+
 uno::Reference< excel::XWorksheet >
 ScVbaRange::getWorksheet() throw (uno::RuntimeException)
 {
diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx
index 7c3a3d9..07b8648 100644
--- a/sc/source/ui/vba/vbarange.hxx
+++ b/sc/source/ui/vba/vbarange.hxx
@@ -183,6 +183,7 @@ public:
 virtual css::uno::Any SAL_CALL getTop() throw (css::uno::RuntimeException);
 virtual css::uno::Any SAL_CALL getLeft() throw 
(css::uno::RuntimeException);
 
+virtual css::uno::Reference< ov::excel::XName > SAL_CALL getName() throw 
(css::uno::RuntimeException);
 virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL 
getWorksheet() throw (css::uno::RuntimeException);
 virtual css::uno::Any SAL_CALL getPageBreak() throw 
(css::uno::RuntimeException);
 virtual void SAL_CALL setPageBreak( const css::uno::Any& _pagebreak ) 
throw (css::uno::RuntimeException);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: LibreOffice is one or several applications?

[V Stuart Foote]

Great topic.  Please take a hard look at impact of this.  

From 3.6.0 onward, handling of Windows "Jump lists" has been an annoyance on
that platform. BTW thank you Jesús for revisiting that issue and correcting 
fdo#35785    for the
time being.

But I think there needs to be a bit of UX discussion since in addition to
Windows AppIDs wouldn't there also be an opportunity to cleanup the menu
behaviors across Windows, OSX and the several *nix Desktop flavors? Have an
open enhancement issue in   fdo#61174
   and several related
bugs to improve handling of recent documents . Suspect that will require
some mix of LibreOffice and OS<->Desktop specific code.

Stuart




--
View this message in context: 
http://nabble.documentfoundation.org/LibreOffice-is-one-or-several-applications-tp4052701p4052809.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] add fallback for Merge-Modules directory (when not found in ...

[Christian Lohmaier (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3680

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/80/3680/1

add fallback for Merge-Modules directory (when not found in registry)

Add "C:\Program Files (x86)\Common Files\Merge Modules" as fallback,
since on Windows Server 2012, the registry entry has not been created
when installing Visual Studio Express

Change-Id: I16f58b8a1d453c8628c6eb66c2cea37ab3da913a
---
M configure.ac
1 file changed, 4 insertions(+), 0 deletions(-)



diff --git a/configure.ac b/configure.ac
index 312998b..9f95298 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4808,6 +4808,10 @@
 fi
 fi
 done
+if test -z "$msmdir"; then
+AC_MSG_NOTICE([no registry entry for Merge Module directory - trying 
"C:\Program Files (x86)\Common Files\Merge Modules"])
+msmdir="C:\Program Files (x86)\Common Files\Merge Modules"
+fi
 msmdir=`cygpath -d "$msmdir"`
 msmdir=`cygpath -u "$msmdir"`
 if test -z "$msmdir"; then

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I16f58b8a1d453c8628c6eb66c2cea37ab3da913a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christian Lohmaier 

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

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

[Markus Mohrhard]

 oox/source/export/chartexport.cxx |   16 +++-
 1 file changed, 7 insertions(+), 9 deletions(-)

New commits:
commit 81b9d431678bc270e7592e9bedb81d2d445e2122
Author: Markus Mohrhard 
Date:   Mon Apr 29 16:33:24 2013 +0200

c:varyColor is true by default in Excel

And another step closer to opening my test file correctly in Excel.

Change-Id: Ib6aa8ddb2f2792513c7263d86865e08fe5f1483d

diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index d0895f3..98fff6f 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1330,6 +1330,10 @@ void ChartExport::exportScatterChart( Reference< 
chart2::XChartType > xChartType
 XML_val, scatterStyle,
 FSEND );
 
+pFS->singleElement( FSNS( XML_c, XML_varyColors ),
+XML_val, "0",
+FSEND );
+
 // FIXME: should export xVal and yVal
 sal_Int32 nAttachedAxis = AXIS_PRIMARY_Y;
 exportSeries( xChartType, nAttachedAxis );
commit 5c19f86a077622141560bdba97e94136db9e9b40
Author: Markus Mohrhard 
Date:   Mon Apr 29 16:13:21 2013 +0200

OSL_TRACE => SAL_WARN in chartexport.cxx

Change-Id: I12ddd18c1b4476d42c097704c2af2d0af4e15a1e

diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index e616922..d0895f3 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -2311,9 +2311,7 @@ void ChartExport::exportDataLabels(
 }
 catch( const uno::Exception & rEx )
 {
-(void)rEx; // avoid warning for pro build
-OSL_TRACE( "Exception caught during Export of data label: %s",
-OUStringToOString( rEx.Message, 
RTL_TEXTENCODING_ASCII_US ).getStr() );
+SAL_WARN("oox", "Exception caught during Export of data label: 
" << rEx.Message );
 }
 
 if( xPropSet.is() )
commit 6ddd7fccdc8fc292200e581dbc4e456ec86cef47
Author: Markus Mohrhard 
Date:   Mon Apr 29 16:12:33 2013 +0200

c:delete is true by default in Excel

One step closer to opening my simple test file correctly in Excel.

Change-Id: I1bfa76a46081ba478e44d8d90d8a91790a9a9ff3

diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index c3cf09f..e616922 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -2085,13 +2085,9 @@ void ChartExport::_exportAxis(
 OUString ("Visible")) >>=  bVisible;
 }
 
-if( !bVisible )
-{
-// other value?
-pFS->singleElement( FSNS( XML_c, XML_delete ),
-XML_val, "1",
+pFS->singleElement( FSNS( XML_c, XML_delete ),
+XML_val, bVisible ? "0" : "1",
 FSEND );
-}
 
 // FIXME: axPos, need to check the property "ReverseDirection"
 pFS->singleElement( FSNS( XML_c, XML_axPos ),
___
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' - oox/inc oox/source sw/qa writerfilter/source

[Cédric Bosdonnat]

 oox/inc/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 51d5e90b7c09cb980bc72a2c6b1a65303ef15ea2
Author: Cédric Bosdonnat 
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.

Change-Id: I8ab158641afcf6b9945c52238e7f5adb9e8b3adf

diff --git a/oox/inc/oox/vml/vmlshape.hxx b/oox/inc/oox/vml/vmlshape.hxx
index bd7ced4..1c289b2 100644
--- a/oox/inc/oox/vml/vmlshape.hxx
+++ b/oox/inc/oox/vml/vmlshape.hxx
@@ -92,6 +92,8 @@ struct OOX_DLLPUBLIC ShapeTypeModel
 OptValue< ::rtl::OUString > moGraphicTitle; ///< Title of the graphic.
 OptValue< ::rtl::OUString > moWrapAnchorX;  ///< The base object from 
which our horizontal positioning should be calculated.
 OptValue< ::rtl::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 a252bb2..730f61e 100644
--- a/oox/source/token/properties.txt
+++ b/oox/source/token/properties.txt
@@ -464,6 +464,7 @@ StringItemList
 Subtotals
 SubViewSize
 Suffix
+Surround
 SwapXAndYAxis
 Symbol
 SymbolColor
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 6dfa35a..5a4a165 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -34,6 +34,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -380,6 +381,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" )
@@ -424,6 +443,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 Rectangle& rShapeRect ) const
diff --git a/oox/source/vml/vmlshapecontext.cxx 
b/oox/source/vml/vmlshapecontext.cxx
index f734999..6a53f17 100644
--- a/oox/source/vml/vmlshapecontext.cxx
+++ b/oox/source/vml/vmlshapecontext.cxx
@@ -332,6 +332,8 @@ ContextHandlerRef ShapeTypeContext::onCreateContext( 
sal_Int32 nElement, const A
 case NMSP_vmlWord | XML_wrap:
 mrTypeModel.moWrapAnchorX = rAttribs.getString(XML_anchorx);
 mrTypeModel.moWrapAnchorY = rAttribs.getString(XML_anchory);
+mrTypeModel.moWrapType = rAttribs.getString(XML_type);
+mrTypeModel.moWrapSide = rAttribs.getString(XML_side);
 break;
 }
 return 0;
diff --git a/sw/qa/extras/ooxmlimport/data/n592908-fra

[PATCH] fdo#33370 Readme file could be easier to follow

[Jan Bobisud (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3679

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/79/3679/1

fdo#33370 Readme file could be easier to follow

Change-Id: I25794499711845cb8183664d1345e5513587d81c
---
M readlicense_oo/docs/readme.xrm
1 file changed, 1 insertion(+), 2 deletions(-)



diff --git a/readlicense_oo/docs/readme.xrm b/readlicense_oo/docs/readme.xrm
index 0f9f47c..ac037035 100755
--- a/readlicense_oo/docs/readme.xrm
+++ b/readlicense_oo/docs/readme.xrm
@@ -133,10 +133,9 @@
When you unpack 
the downloaded archive, you will see that the contents have been decompressed 
into a sub-directory. Open a file manager window, and change directory to the 
one starting with "LibreOffice_", followed by the version number and some 
platform information.
This directory 
contains a subdirectory called "DEBS". Change directory to the "DEBS" 
directory.
Right-click 
within the directory and choose "Open in Terminal". A terminal window will 
open. From the command line of the terminal window, enter the following command 
(you will be prompted to enter your root user's password before the command 
will execute):
+   The following 
commands will install LibreOffice and the desktop integration packages (you may 
just copy and paste them into the terminal screen rather than trying to type 
them):
sudo dpkg -i 
*.deb
-   The above dpkg 
command does the first part of the installation process. To complete the 
process, you also need to install the desktop integration packages. To do this, 
change directory to the "desktop-integration" directory that is within the 
"DEBS" directory, using the following command:
cd 
desktop-integration
-   Now run the 
dpkg command again:
sudo dpkg -i 
*.deb
The 
installation process is now completed, and you should have icons for all the 
${PRODUCTNAME} applications in your desktop's Applications/Office menu.
Installation of 
${PRODUCTNAME} on Fedora, openSUSE, Mandriva and other Linux systems using RPM 
packages

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I25794499711845cb8183664d1345e5513587d81c
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Jan Bobisud 

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

[PUSHED] Clang cleanup, unaligned if statement

[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/3677

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7f7c312d2c0167a17e31624e197ae75b77fa0c2f
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Noel Grandin 
Gerrit-Reviewer: Tor Lillqvist 

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

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

[Noel Grandin]

 cppcanvas/source/mtfrenderer/emfplus.cxx |   10 +++---
 1 file changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 2f1a293e1a119ad12e0b592da9f7e2f7d88e2479
Author: Noel Grandin 
Date:   Fri Apr 26 13:27:32 2013 +0200

Clang cleanup, unaligned if statement

The extra semi-colons were confusing clang. Just remove the macro,
it's not adding any real value.

Change-Id: I7f7c312d2c0167a17e31624e197ae75b77fa0c2f
Reviewed-on: https://gerrit.libreoffice.org/3677
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx 
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 2a3d9de..52fc36b 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -870,10 +870,6 @@ namespace cppcanvas
  (x >> 8) & 0xff, \
  x & 0xff), \
 
rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace());
-#define SET_FILL_COLOR(x) \
-rState.fillColor = COLOR(x);
-#define SET_TEXT_COLOR(x) \
-rState.textColor = COLOR(x);
 
 void ImplRenderer::EMFPPlusFillPolygon (::basegfx::B2DPolyPolygon& 
polygon, const ActionFactoryParameters& rParms,
 OutDevState& rState, const 
CanvasSharedPtr& rCanvas, bool isColor, sal_uInt32 brushIndexOrColor)
@@ -891,7 +887,7 @@ namespace cppcanvas
 rState.isFillColorSet = true;
 rState.isLineColorSet = false;
 
-SET_FILL_COLOR(brushIndexOrColor);
+rState.fillColor = COLOR(brushIndexOrColor);
 
 pPolyAction = ActionSharedPtr ( 
internal::PolyPolyActionFactory::createPolyPolyAction( localPolygon, 
rParms.mrCanvas, rState ) );
 
@@ -1641,7 +1637,7 @@ namespace cppcanvas
 OUString text = read_uInt16s_ToOUString(rMF, 
stringLength);
 
 double cellSize = setFont (flags & 0xff, 
rFactoryParms, rState);
-SET_TEXT_COLOR( brushId );
+rState.textColor = COLOR( brushId );
 
 ActionSharedPtr pTextAction(
 TextActionFactory::createTextAction(
@@ -1881,7 +1877,7 @@ namespace cppcanvas
 setFont (flags & 0xff, rFactoryParms, rState);
 
 if( flags & 0x8000 )
-SET_TEXT_COLOR(brushIndexOrColor);
+rState.textColor = COLOR( brushIndexOrColor );
 
 ActionSharedPtr pTextAction(
 TextActionFactory::createTextAction(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Clang cleanup, unused mutex variables

[Noel Grandin (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3678

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/78/3678/1

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
---
M drawinglayer/source/geometry/viewinformation2d.cxx
M drawinglayer/source/geometry/viewinformation3d.cxx
M drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
M drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
M drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx
M svx/source/sdr/primitive2d/sdrprimitivetools.cxx
6 files changed, 5 insertions(+), 16 deletions(-)



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 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -322,8 +321,6 @@
 
 const basegfx::B2DRange& getDiscreteViewport() const
 {
-::osl::Mutex m_mutex;
-
 if(maDiscreteViewport.isEmpty() && !maViewport.isEmpty())
 {
 basegfx::B2DRange aDiscreteViewport(maViewport);
@@ -336,8 +333,6 @@
 
 const basegfx::B2DHomMatrix& getObjectToViewTransformation() const
 {
-::osl::Mutex m_mutex;
-
 if(maObjectToViewTransformation.isIdentity() &&
 (!maObjectTransformation.isIdentity() || 
!maViewTransformation.isIdentity()))
 {
@@ -350,8 +345,6 @@
 
 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 @@
 const basegfx::B3DHomMatrix& getObjectToView() const
 {
 // on demand WorldToView creation
-::osl::Mutex m_mutex;
 
 if(maObjectToView.isIdentity())
 {
@@ -404,8 +403,6 @@
 
 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 @@
 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 @@
 // 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;
 const_cast< SdrExtrudePrimitive3D& >(*this).impCreateSlices();
 }
 
@@ -493,7 +492,6 @@
 {
 // conditions of last local decomposition with reduced 
lines have changed. Remember
 // new one and clear current decompositiopn
-::osl::Mutex m_mutex;
 SdrExtrudePrimitive3D* pThat = const_cast< 
SdrExtrudePrimitive3D* >(this);
 pThat->setBuffered3DDecomposition(Primitive3DSequence());
 delete pThat->mpLastRLGViewInformation;
diff

[PATCH] Clang cleanup, unaligned if statement

[Noel Grandin (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3677

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/77/3677/1

Clang cleanup, unaligned if statement

The extra semi-colons were confusing clang. Just remove the macro,
it's not adding any real value.

Change-Id: I7f7c312d2c0167a17e31624e197ae75b77fa0c2f
---
M cppcanvas/source/mtfrenderer/emfplus.cxx
1 file changed, 3 insertions(+), 7 deletions(-)



diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx 
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 2a3d9de..52fc36b 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -870,10 +870,6 @@
  (x >> 8) & 0xff, \
  x & 0xff), \
 
rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace());
-#define SET_FILL_COLOR(x) \
-rState.fillColor = COLOR(x);
-#define SET_TEXT_COLOR(x) \
-rState.textColor = COLOR(x);
 
 void ImplRenderer::EMFPPlusFillPolygon (::basegfx::B2DPolyPolygon& 
polygon, const ActionFactoryParameters& rParms,
 OutDevState& rState, const 
CanvasSharedPtr& rCanvas, bool isColor, sal_uInt32 brushIndexOrColor)
@@ -891,7 +887,7 @@
 rState.isFillColorSet = true;
 rState.isLineColorSet = false;
 
-SET_FILL_COLOR(brushIndexOrColor);
+rState.fillColor = COLOR(brushIndexOrColor);
 
 pPolyAction = ActionSharedPtr ( 
internal::PolyPolyActionFactory::createPolyPolyAction( localPolygon, 
rParms.mrCanvas, rState ) );
 
@@ -1641,7 +1637,7 @@
 OUString text = read_uInt16s_ToOUString(rMF, 
stringLength);
 
 double cellSize = setFont (flags & 0xff, 
rFactoryParms, rState);
-SET_TEXT_COLOR( brushId );
+rState.textColor = COLOR( brushId );
 
 ActionSharedPtr pTextAction(
 TextActionFactory::createTextAction(
@@ -1881,7 +1877,7 @@
 setFont (flags & 0xff, rFactoryParms, rState);
 
 if( flags & 0x8000 )
-SET_TEXT_COLOR(brushIndexOrColor);
+rState.textColor = COLOR( brushIndexOrColor );
 
 ActionSharedPtr pTextAction(
 TextActionFactory::createTextAction(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f7c312d2c0167a17e31624e197ae75b77fa0c2f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Noel Grandin 

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

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

[Stephan Bergmann]

 solenv/gbuild/platform/com_MSC_class.mk |   29 -
 1 file changed, 29 deletions(-)

New commits:
commit 8b3b9d24197982993839af92ae9acb718c4fd513
Author: Stephan Bergmann 
Date:   Mon Apr 29 15:27:40 2013 +0200

gb_JunitTest_JunitTest_platform_longpathname_hack is unused

...since 81af84c04fa7ef8c8c12d2a9d3899a9a75cb8260 "gbuild: let JunitTests 
run
with MSVC."

Change-Id: I4ba97431c3439c0bed74149fe66cbb76db5317ce

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index 49b9bbf..4d6b264 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -447,35 +447,6 @@ endef
 gb_defaultlangiso := en-US
 gb_smoketest_instset := 
$(SRCDIR)/instsetoo_native/$(INPATH)/OpenOffice/archive/install/$(gb_defaultlangiso)/OOo_*_install-arc_$(gb_defaultlangiso).zip
 
-ifeq ($(OOO_TEST_SOFFICE),)
-
-
-# Work around Windows problems with long pathnames (see issue 50885) by
-# installing into the temp directory instead of the module output tree (in 
which
-# case $(target).instpath contains the path to the temp installation,
-# which is removed after smoketest); can be removed once issue 50885 is fixed;
-# on other platforms, a single installation to solver is created in
-# smoketestoo_native.
-
-# for now, no dependency on $(shell ls $(gb_smoketest_instset))
-# because that doesn't work before the instset is built
-# and there is not much of a benefit anyway (gbuild not knowing about 
smoketest)
-define gb_JunitTest_JunitTest_platform_longpathname_hack
-$(call gb_JunitTest_get_target,$(1)) : $(call 
gb_JunitTest_get_target,$(1)).instpath
-$(call gb_JunitTest_get_target,$(1)) : CLEAN_CMD = $(call 
gb_Helper_abbreviate_dirs,rm -rf `cat $$@.instpath` $$@.instpath)
-
-$(call gb_JunitTest_get_target,$(1)).instpath : 
-   INST_DIR=(cygpath -m `mktemp -d -t testinst.XX`) \
-   && unzip -d "{INST_DIR}"  $$(gb_smoketest_instset) \
-   && mv "{INST_DIR}"/OOo_*_install-arc_$$(gb_defaultlangiso) 
"{INST_DIR}"/opt\
-   && mkdir -p $$(dir $$@) \
-   && echo "{INST_DIR}" > $$@
-
-endef
-else # OOO_TEST_SOFFICE
-gb_JunitTest_JunitTest_platform_longpathname_hack =
-endif # OOO_TEST_SOFFICE
-
 define gb_JunitTest_JunitTest_platform
 $(call gb_JunitTest_get_target,$(1)) : DEFS := \

-Dorg.openoffice.test.arg.soffice="{OOO_TEST_SOFFICE:-path:$(gb_DEVINSTALLROOT)/program/soffice.exe}"
 \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[ABANDONED] use LanguageTag fallback

[Eike Rathke (via Code Review)]

Eike Rathke has abandoned this change.

Change subject: use LanguageTag fallback
..


Patch Set 1: Abandoned

erroneous

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: I34c532dc7d1c71724a5c0e29c113f2d6510cc2d7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Eike Rathke 

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

[ABANDONED] ditch libi18nlangtagicu again

[Eike Rathke (via Code Review)]

Eike Rathke has abandoned this change.

Change subject: ditch libi18nlangtagicu again
..


Patch Set 1: Abandoned

erroneous

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: I77934b17c2b994a03cae5440253b165704de2fa4
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Eike Rathke 

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

[ABANDONED] remove non-existant module

[Eike Rathke (via Code Review)]

Eike Rathke has abandoned this change.

Change subject: remove non-existant module
..


Patch Set 1: Abandoned

erroneous

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: I7c4e2c9635f52f682595d95fca8a5f200a1074de
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Eike Rathke 
Gerrit-Reviewer: Peter Foley 

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

[ABANDONED] removed commented out code that wouldn't be correct anyway

[Eike Rathke (via Code Review)]

Eike Rathke has abandoned this change.

Change subject: removed commented out code that wouldn't be correct anyway
..


Patch Set 1: Abandoned

erroneous

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: I1fc5f6b7e779ae0c9ac5f30934c2c5d75757581d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Eike Rathke 

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

[ABANDONED] can we stick a with our naming conventions, just a little bi...

[Eike Rathke (via Code Review)]

Eike Rathke has abandoned this change.

Change subject: can we stick a with our naming conventions, just a little bit?
..


Patch Set 1: Abandoned

erroneous

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: I1457c64162c2aeb083e98a28737991ae6d0eee2e
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Eike Rathke 

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

[ABANDONED] use LanguageTagIcu

[Eike Rathke (via Code Review)]

Eike Rathke has abandoned this change.

Change subject: use LanguageTagIcu
..


Patch Set 1: Abandoned

erroneous

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: I1e66fa3edb2ddf2b6d6f4cdd25104772ff02c70a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Eike Rathke 

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

[ABANDONED] use LanguageTagIcu

[Eike Rathke (via Code Review)]

Eike Rathke has abandoned this change.

Change subject: use LanguageTagIcu
..


Patch Set 1: Abandoned

erroneous

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: I7b052a3f73740ff3a35f38dc2d96bc621b8d8deb
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Eike Rathke 

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

[ABANDONED] added LanguageTagIcu::getIcuLocale() with additional variant

[Eike Rathke (via Code Review)]

Eike Rathke has abandoned this change.

Change subject: added LanguageTagIcu::getIcuLocale() with additional variant
..


Patch Set 1: Abandoned

erroneous

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: I5a5689f449ac7653bb716f2ce67ea1039fe2559c
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Eike Rathke 

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

[ABANDONED] use LanguageTagIcu

[Eike Rathke (via Code Review)]

Eike Rathke has abandoned this change.

Change subject: use LanguageTagIcu
..


Patch Set 1: Abandoned

erroneous

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: I3ced460cc5a03554dc77e19381af8a5ba202d2ab
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Eike Rathke 

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

[ABANDONED] use LanguageTagIcu

[Eike Rathke (via Code Review)]

Eike Rathke has abandoned this change.

Change subject: use LanguageTagIcu
..


Patch Set 1: Abandoned

erroneous

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: I048d72c0cd633e3aa9e6a74e4f111703969b1d77
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Eike Rathke 

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

[ABANDONED] introduced libi18nlangtagicu

[Eike Rathke (via Code Review)]

Eike Rathke has abandoned this change.

Change subject: introduced libi18nlangtagicu
..


Patch Set 1: Abandoned

erroneous

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: Ie80e989d55d465e127ccc20290d654acf222e5bb
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Eike Rathke 

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

[ABANDONED] removed cruft, added instdir to filter

[Eike Rathke (via Code Review)]

Eike Rathke has abandoned this change.

Change subject: removed cruft, added instdir to filter
..


Patch Set 1: Abandoned

erroneous

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: I30b1b923658a851535f309c3773f5cbfa697d1bf
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Eike Rathke 

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

[PATCH] remove non-existant module

[Eike Rathke (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3673

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/73/3673/1

remove non-existant module

Change-Id: I7c4e2c9635f52f682595d95fca8a5f200a1074de
---
M RepositoryModule_host.mk
1 file changed, 0 insertions(+), 1 deletion(-)



diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index e504cdc..1b939f1 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -80,7 +80,6 @@
hwpfilter \
$(call gb_Helper_optional,HYPHEN,hyphen) \
i18nlangtag \
-   i18nlangtagicu \
i18npool \
i18nutil \
$(call gb_Helper_optional,ICU,icu) \

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c4e2c9635f52f682595d95fca8a5f200a1074de
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Eike Rathke 
Gerrit-Reviewer: Peter Foley 

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

[PATCH] use LanguageTag fallback

[Eike Rathke (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3675

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/75/3675/1

use LanguageTag fallback

Change-Id: I34c532dc7d1c71724a5c0e29c113f2d6510cc2d7
---
M vcl/source/gdi/impimagetree.cxx
1 file changed, 6 insertions(+), 17 deletions(-)



diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx
index 29f3e7a..d7c50d9 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.cxx
@@ -235,23 +235,12 @@
 if (localized) {
 sal_Int32 pos = name.lastIndexOf('/');
 if (pos != -1) {
-/* FIXME-BCP47: this needs to be changed for language tags! */
-css::lang::Locale const & loc =
-Application::GetSettings().GetUILanguageTag().getLocale();
-paths.push_back(createPath(name, pos, loc.Language));
-if (!loc.Country.isEmpty()) {
-OUStringBuffer b(loc.Language);
-b.append(sal_Unicode('-'));
-b.append(loc.Country);
-OUString p(createPath(name, pos, b.makeStringAndClear()));
-paths.push_back(p);
-if (!loc.Variant.isEmpty()) {
-b.append(p);
-b.append(sal_Unicode('-'));
-b.append(loc.Variant);
-paths.push_back(
-createPath(name, pos, b.makeStringAndClear()));
-}
+// find() uses a reverse iterator, so push in reverse order.
+std::vector< OUString > aFallbacks( 
Application::GetSettings().GetUILanguageTag().getFallbackStrings());
+for (std::vector< OUString >::const_reverse_iterator it( 
aFallbacks.rbegin());
+it != aFallbacks.rend(); ++it)
+{
+paths.push_back(createPath(name, pos, *it));
 }
 }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I34c532dc7d1c71724a5c0e29c113f2d6510cc2d7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Eike Rathke 

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

[PATCH] ditch libi18nlangtagicu again

[Eike Rathke (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3674

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/74/3674/1

ditch libi18nlangtagicu again

Thanks to Fridrich for finding the real cause for why I thought this was
necessary..

Change-Id: I77934b17c2b994a03cae5440253b165704de2fa4
---
M Library_merged.mk
M Repository.mk
M i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk
M i18nlangtag/Library_i18nlangtag.mk
D i18nlangtag/Library_i18nlangtagicu.mk
M i18nlangtag/Module_i18nlangtag.mk
M i18npool/Library_i18npool.mk
M include/i18nlangtag/languagetagicu.hxx
M lotuswordpro/Library_lwpft.mk
9 files changed, 10 insertions(+), 43 deletions(-)



diff --git a/Library_merged.mk b/Library_merged.mk
index 4603bda..2d5ef60 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -33,7 +33,6 @@
cppu \
cppuhelper \
i18nlangtag \
-   i18nlangtagicu \
$(if $(filter TRUE,$(SOLAR_JAVA)), \
jvmaccess \
jvmfwk) \
diff --git a/Repository.mk b/Repository.mk
index 2094721a..0ccc03d 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -469,7 +469,6 @@
deployment \
fileacc \
i18nlangtag \
-   i18nlangtagicu \
i18nutil \
mcnttype \
package2 \
diff --git a/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk 
b/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk
index a1f2943..f001717 100644
--- a/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk
+++ b/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk
@@ -14,9 +14,8 @@
offapi \
 ))
 
-$(eval $(call 
gb_CppunitTest_use_library_objects,i18nlangtag_test_languagetag,i18nlangtag))
-
 $(eval $(call gb_CppunitTest_use_libraries,i18nlangtag_test_languagetag,\
+   i18nlangtag \
cppu \
cppuhelper \
sal \
diff --git a/i18nlangtag/Library_i18nlangtag.mk 
b/i18nlangtag/Library_i18nlangtag.mk
index 3faacc4..c88b852 100644
--- a/i18nlangtag/Library_i18nlangtag.mk
+++ b/i18nlangtag/Library_i18nlangtag.mk
@@ -39,11 +39,17 @@
$(gb_UWINAPI) \
 ))
 
+$(eval $(call gb_Library_use_externals,i18nlangtag,\
+   icu_headers \
+   icuuc \
+))
+
 $(eval $(call gb_Library_add_exception_objects,i18nlangtag,\
i18nlangtag/source/isolang/insys \
i18nlangtag/source/isolang/isolang \
i18nlangtag/source/isolang/mslangid \
i18nlangtag/source/languagetag/languagetag \
+   i18nlangtag/source/languagetag/languagetagicu \
 ))
 
 
diff --git a/i18nlangtag/Library_i18nlangtagicu.mk 
b/i18nlangtag/Library_i18nlangtagicu.mk
deleted file mode 100644
index d1def1b..000
--- a/i18nlangtag/Library_i18nlangtagicu.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- 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_Library_Library,i18nlangtagicu))
-
-$(eval $(call gb_Library_use_sdk_api,i18nlangtagicu))
-
-$(eval $(call gb_Library_add_defs,i18nlangtagicu,\
-   -DI18NLANGTAG_DLLIMPLEMENTATION \
-))
-
-$(eval $(call gb_Library_use_libraries,i18nlangtagicu,\
-   sal \
-   i18nlangtag \
-   $(gb_UWINAPI) \
-))
-
-$(eval $(call gb_Library_use_externals,i18nlangtagicu,\
-   icu_headers \
-   icuuc \
-))
-
-$(eval $(call gb_Library_add_exception_objects,i18nlangtagicu,\
-   i18nlangtag/source/languagetag/languagetagicu \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/i18nlangtag/Module_i18nlangtag.mk 
b/i18nlangtag/Module_i18nlangtag.mk
index 22b8a7f..edd2e1d 100644
--- a/i18nlangtag/Module_i18nlangtag.mk
+++ b/i18nlangtag/Module_i18nlangtag.mk
@@ -10,7 +10,6 @@
 
 $(eval $(call gb_Module_add_targets,i18nlangtag,\
Library_i18nlangtag \
-   Library_i18nlangtagicu \
 ))
 
 $(eval $(call gb_Module_add_check_targets,i18nlangtag,\
diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk
index 5fe9e2c..955579f 100644
--- a/i18npool/Library_i18npool.mk
+++ b/i18npool/Library_i18npool.mk
@@ -42,7 +42,6 @@
cppu \
cppuhelper \
i18nlangtag \
-   i18nlangtagicu \
i18nutil \
sal \
$(gb_UWINAPI) \
diff --git a/include/i18nlangtag/languagetagicu.hxx 
b/include/i18nlangtag/languagetagicu.hxx
index 2fc9db3..094f077 100644
--- a/include/i18nlangtag/languagetagicu.hxx
+++ b/include/i18nlangtag/languagetagicu.hxx
@@ -20,10 +20,9 @@
 
 /** Interface LanguageTag to ICU's icu::Locale
 
-Separated from LanguageTag into its own library to not pollute the entire
-code base with ICU header file inclusion and linkage, only the few code
-actually using this needs to link against ICU libraries, which it did
-anyway.
+Separated from LanguageTag to not pollute the entire code

[PATCH] removed commented out code that wouldn't be correct anyway

[Eike Rathke (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3672

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/72/3672/1

removed commented out code that wouldn't be correct anyway

Change-Id: I1fc5f6b7e779ae0c9ac5f30934c2c5d75757581d
---
M lotuswordpro/source/filter/lwptools.cxx
1 file changed, 0 insertions(+), 45 deletions(-)



diff --git a/lotuswordpro/source/filter/lwptools.cxx 
b/lotuswordpro/source/filter/lwptools.cxx
index 9ef4ec5..77eb3dc 100644
--- a/lotuswordpro/source/filter/lwptools.cxx
+++ b/lotuswordpro/source/filter/lwptools.cxx
@@ -262,29 +262,7 @@
 style = icu::DateFormat::FULL;//system full date format
 else
 style = icu::DateFormat::SHORT;//system short date format
-/*  ::com::sun::star::lang::Locale 
aLocale=Application::GetSettings().GetLocale();
-OUString strLang = aLocale.Language;
-OUString strCountry = aLocale.Country;
-strLang = strLang + A2OUSTR("_");
-OUString strLocale = strLang + strCountry;
 
-int32_t nLength = 0;
-int32_t nLengthNeed;
-UErrorCode status = U_ZERO_ERROR;
-UChar* pattern = NULL;
-
-UDateFormat* fmt= udat_open(UDAT_FULL, UDAT_FULL,
-
(char*)(OUStringToOString(strLocale,RTL_TEXTENCODING_MS_1252).getStr()), NULL, 
0, NULL, 0, &status);
-
-nLengthNeed = udat_toPattern(fmt,true,NULL,nLength,&status);
-if (status == U_BUFFER_OVERFLOW_ERROR)
-{
-status = U_ZERO_ERROR;
-nLength = nLengthNeed +1;
-pattern = (UChar*)malloc(sizeof(UChar)*nLength);
-udat_toPattern(fmt,true,pattern,nLength,&status);
-}
-*/
 //1 get locale for system
 icu::Locale aLocale( LanguageTagIcu::getIcuLocale( 
Application::GetSettings().GetLanguageTag()));
 //2 get icu format pattern by locale
@@ -671,29 +649,6 @@
 */
 XFTimeStyle* LwpTools::GetSystemTimeStyle()
 {
-/*  ::com::sun::star::lang::Locale 
aLocale=Application::GetSettings().GetLocale();
-OUString strLang = aLocale.Language;
-OUString strCountry = aLocale.Country;
-strLang = strLang + A2OUSTR("_");
-OUString strLocale = strLang + strCountry;
-
-int32_t nLength = 0;
-int32_t nLengthNeed;
-UErrorCode status = U_ZERO_ERROR;
-UChar* pattern = NULL;
-
-UDateFormat* fmt= udat_open(UDAT_FULL, UDAT_FULL,
-
(char*)(OUStringToOString(strLocale,RTL_TEXTENCODING_MS_1252).getStr()), NULL, 
0, NULL, 0, &status);
-
-nLengthNeed = udat_toPattern(fmt,true,NULL,nLength,&status);
-if (status == U_BUFFER_OVERFLOW_ERROR)
-{
-status = U_ZERO_ERROR;
-nLength = nLengthNeed +1;
-pattern = (UChar*)malloc(sizeof(UChar)*nLength);
-udat_toPattern(fmt,true,pattern,nLength,&status);
-}
-*/
 //1 get locale for system
 icu::Locale aLocale( LanguageTagIcu::getIcuLocale( 
Application::GetSettings().GetLanguageTag()));
 //2 get icu format pattern by locale

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1fc5f6b7e779ae0c9ac5f30934c2c5d75757581d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Eike Rathke 

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

[PATCH] can we stick a with our naming conventions, just a little bi...

[Eike Rathke (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3671

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/71/3671/1

can we stick a with our naming conventions, just a little bit?

Change-Id: I1457c64162c2aeb083e98a28737991ae6d0eee2e
---
M i18npool/source/ordinalsuffix/ordinalsuffix.cxx
1 file changed, 4 insertions(+), 4 deletions(-)



diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx 
b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
index 953c886..f9491b2 100644
--- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
+++ b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
@@ -66,19 +66,19 @@
  * than english ones, ICU 4.2+ has to be used.
  */
 uno::Sequence< OUString > SAL_CALL OrdinalSuffix::getOrdinalSuffix( sal_Int32 
nNumber,
-const lang::Locale &aLocale ) throw( RuntimeException )
+const lang::Locale &rLocale ) throw( RuntimeException )
 {
 uno::Sequence< OUString > retValue;
 
 // Get the value from ICU
 UErrorCode nCode = U_ZERO_ERROR;
-const icu::Locale rIcuLocale( LanguageTagIcu::getIcuLocale( LanguageTag( 
aLocale)));
+const icu::Locale aIcuLocale( LanguageTagIcu::getIcuLocale( LanguageTag( 
rLocale)));
 
-icu::RuleBasedNumberFormat formatter(icu::URBNF_ORDINAL, rIcuLocale, 
nCode);
+icu::RuleBasedNumberFormat formatter(icu::URBNF_ORDINAL, aIcuLocale, 
nCode);
 if (!U_SUCCESS(nCode))
 return retValue;
 
-boost::scoped_ptr 
xNumberFormat(icu::NumberFormat::createInstance(rIcuLocale, nCode));
+boost::scoped_ptr 
xNumberFormat(icu::NumberFormat::createInstance(aIcuLocale, nCode));
 if (!U_SUCCESS(nCode))
 return retValue;
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1457c64162c2aeb083e98a28737991ae6d0eee2e
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Eike Rathke 

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

[PATCH] use LanguageTagIcu

[Eike Rathke (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3670

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/70/3670/1

use LanguageTagIcu

Change-Id: I1e66fa3edb2ddf2b6d6f4cdd25104772ff02c70a
---
M i18npool/source/ordinalsuffix/ordinalsuffix.cxx
1 file changed, 3 insertions(+), 6 deletions(-)



diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx 
b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
index 45306cf..953c886 100644
--- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
+++ b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
@@ -18,14 +18,14 @@
  */
 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include "ordinalsuffix.hxx"
 
 #include 
 #include 
-
-#define CSTR( ouStr ) OUStringToOString( ouStr, RTL_TEXTENCODING_UTF8 
).getStr( )
 
 using namespace ::com::sun::star::i18n;
 using namespace ::com::sun::star::uno;
@@ -72,10 +72,7 @@
 
 // Get the value from ICU
 UErrorCode nCode = U_ZERO_ERROR;
-const icu::Locale rIcuLocale(
-CSTR( aLocale.Language ),
-CSTR( aLocale.Country ),
-CSTR( aLocale.Variant ) );
+const icu::Locale rIcuLocale( LanguageTagIcu::getIcuLocale( LanguageTag( 
aLocale)));
 
 icu::RuleBasedNumberFormat formatter(icu::URBNF_ORDINAL, rIcuLocale, 
nCode);
 if (!U_SUCCESS(nCode))

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1e66fa3edb2ddf2b6d6f4cdd25104772ff02c70a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Eike Rathke 

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

[PATCH] use LanguageTagIcu

[Eike Rathke (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3669

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/69/3669/1

use LanguageTagIcu

Change-Id: I7b052a3f73740ff3a35f38dc2d96bc621b8d8deb
---
M i18npool/source/collator/collator_unicode.cxx
1 file changed, 4 insertions(+), 5 deletions(-)



diff --git a/i18npool/source/collator/collator_unicode.cxx 
b/i18npool/source/collator/collator_unicode.cxx
index 40b5c47..a7cf05b 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -22,6 +22,8 @@
 #include "lrl_include.hxx"
 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -213,13 +215,10 @@
 /** ICU collators are loaded using a locale only.
 ICU uses Variant as collation algorithm name (like 
de__PHONEBOOK
 locale), note the empty territory (Country) designator in this 
special
-case here. The icu::Locale contructor changes the algorithm 
name to
+case here. The icu::Locale constructor changes the algorithm 
name to
 uppercase itself, so we don't have to bother with that.
 */
-icu::Locale icuLocale(
-   OUStringToOString(rLocale.Language, 
RTL_TEXTENCODING_ASCII_US).getStr(),
-   OUStringToOString(rLocale.Country, 
RTL_TEXTENCODING_ASCII_US).getStr(),
-   OUStringToOString(rAlgorithm, 
RTL_TEXTENCODING_ASCII_US).getStr());
+icu::Locale icuLocale( LanguageTagIcu::getIcuLocale( LanguageTag( 
rLocale), rAlgorithm));
 // load ICU collator
 collator = (RuleBasedCollator*) 
icu::Collator::createInstance(icuLocale, status);
 if (! U_SUCCESS(status)) throw RuntimeException();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7b052a3f73740ff3a35f38dc2d96bc621b8d8deb
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Eike Rathke 

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

[PATCH] added LanguageTagIcu::getIcuLocale() with additional variant

[Eike Rathke (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3668

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/68/3668/1

added LanguageTagIcu::getIcuLocale() with additional variant

Change-Id: I5a5689f449ac7653bb716f2ce67ea1039fe2559c
---
M i18nlangtag/source/languagetag/languagetagicu.cxx
M include/i18nlangtag/languagetagicu.hxx
2 files changed, 23 insertions(+), 0 deletions(-)



diff --git a/i18nlangtag/source/languagetag/languagetagicu.cxx 
b/i18nlangtag/source/languagetag/languagetagicu.cxx
index 6f426d6..e088b3c 100644
--- a/i18nlangtag/source/languagetag/languagetagicu.cxx
+++ b/i18nlangtag/source/languagetag/languagetagicu.cxx
@@ -33,4 +33,15 @@
 OUStringToOString( rLanguageTag.getBcp47(), 
RTL_TEXTENCODING_ASCII_US).getStr());
 }
 
+
+// static
+icu::Locale LanguageTagIcu::getIcuLocale( const LanguageTag & rLanguageTag, 
const OUString & rVariant )
+{
+/* FIXME: how should this work with any BCP47? */
+return icu::Locale(
+OUStringToOString( rLanguageTag.getLanguage(), 
RTL_TEXTENCODING_ASCII_US).getStr(),
+OUStringToOString( rLanguageTag.getCountry(), 
RTL_TEXTENCODING_ASCII_US).getStr(),
+OUStringToOString( rVariant, RTL_TEXTENCODING_ASCII_US).getStr());
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/i18nlangtag/languagetagicu.hxx 
b/include/i18nlangtag/languagetagicu.hxx
index 20e5349..2fc9db3 100644
--- a/include/i18nlangtag/languagetagicu.hxx
+++ b/include/i18nlangtag/languagetagicu.hxx
@@ -12,6 +12,7 @@
 
 #include 
 #include 
+#include 
 #include 
 
 class LanguageTag;
@@ -37,6 +38,17 @@
 Always resolves an empty tag to the system locale.
  */
 static  icu::Locale getIcuLocale( const LanguageTag & rLanguageTag );
+
+/** Obtain language tag as ICU icu::Locale, adding variant data.
+
+From the LanguageTag only language and country are used to construct
+the icu:Locale, the variant field is copied from rVariant. For example
+needed to create an icu::Collator instance where the variant field
+denotes the algorithm to be used.
+
+Always resolves an empty tag to the system locale.
+ */
+static  icu::Locale getIcuLocale( const LanguageTag & rLanguageTag, 
const OUString & rVariant );
 };
 
 #endif  // INCLUDED_I18NLANGTAG_LANGUAGETAGICU_HXX

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a5689f449ac7653bb716f2ce67ea1039fe2559c
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Eike Rathke 

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

[PATCH] use LanguageTagIcu

[Eike Rathke (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3667

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/67/3667/1

use LanguageTagIcu

Change-Id: I3ced460cc5a03554dc77e19381af8a5ba202d2ab
---
M i18npool/Library_i18npool.mk
M i18npool/source/breakiterator/breakiterator_unicode.cxx
2 files changed, 4 insertions(+), 4 deletions(-)



diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk
index 955579f..5fe9e2c 100644
--- a/i18npool/Library_i18npool.mk
+++ b/i18npool/Library_i18npool.mk
@@ -42,6 +42,7 @@
cppu \
cppuhelper \
i18nlangtag \
+   i18nlangtagicu \
i18nutil \
sal \
$(gb_UWINAPI) \
diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx 
b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index 5b24f81..620bba1 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -19,6 +19,8 @@
 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -148,10 +150,7 @@
 }
 
 if (!icuBI->aBreakIterator) {
-icu::Locale icuLocale(
-OUStringToOString(rLocale.Language, 
RTL_TEXTENCODING_ASCII_US).getStr(),
-OUStringToOString(rLocale.Country, 
RTL_TEXTENCODING_ASCII_US).getStr(),
-OUStringToOString(rLocale.Variant, 
RTL_TEXTENCODING_ASCII_US).getStr());
+icu::Locale icuLocale( LanguageTagIcu::getIcuLocale( LanguageTag( 
rLocale)));
 
 status = U_ZERO_ERROR;
 switch (rBreakType) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3ced460cc5a03554dc77e19381af8a5ba202d2ab
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Eike Rathke 

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

[PATCH] use LanguageTagIcu

[Eike Rathke (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3666

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/66/3666/1

use LanguageTagIcu

Change-Id: I048d72c0cd633e3aa9e6a74e4f111703969b1d77
---
M lotuswordpro/Library_lwpft.mk
M lotuswordpro/source/filter/lwptools.cxx
2 files changed, 7 insertions(+), 15 deletions(-)



diff --git a/lotuswordpro/Library_lwpft.mk b/lotuswordpro/Library_lwpft.mk
index f01261d..7673eb3 100644
--- a/lotuswordpro/Library_lwpft.mk
+++ b/lotuswordpro/Library_lwpft.mk
@@ -17,6 +17,7 @@
 cppuhelper \
 sal \
i18nlangtag \
+   i18nlangtagicu \
 sfx \
 sot \
 svt \
diff --git a/lotuswordpro/source/filter/lwptools.cxx 
b/lotuswordpro/source/filter/lwptools.cxx
index dd723cc..9ef4ec5 100644
--- a/lotuswordpro/source/filter/lwptools.cxx
+++ b/lotuswordpro/source/filter/lwptools.cxx
@@ -71,6 +71,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #ifdef SAL_UNX
 #define SEPARATOR '/'
@@ -284,15 +285,10 @@
 udat_toPattern(fmt,true,pattern,nLength,&status);
 }
 */
-/* FIXME-BCP47: handle language tags! */
 //1 get locale for system
-::com::sun::star::lang::Locale 
aLocale=Application::GetSettings().GetLanguageTag().getLocale();
-OUString strLang = aLocale.Language;
-OUString strCountry = aLocale.Country;
-icu::Locale 
bLocale((char*)(OUStringToOString(strLang,RTL_TEXTENCODING_MS_1252).getStr()),
-
(char*)(OUStringToOString(strCountry,RTL_TEXTENCODING_MS_1252).getStr()));
+icu::Locale aLocale( LanguageTagIcu::getIcuLocale( 
Application::GetSettings().GetLanguageTag()));
 //2 get icu format pattern by locale
-icu::DateFormat* fmt = icu::DateFormat::createDateInstance(style,bLocale);
+icu::DateFormat* fmt = icu::DateFormat::createDateInstance(style,aLocale);
 
 int32_t nLength = 0;
 int32_t nLengthNeed;
@@ -698,16 +694,11 @@
 udat_toPattern(fmt,true,pattern,nLength,&status);
 }
 */
-/* FIXME-BCP47: handle language tags! */
 //1 get locale for system
-::com::sun::star::lang::Locale 
aLocale=Application::GetSettings().GetLanguageTag().getLocale();
-OUString strLang = aLocale.Language;
-OUString strCountry = aLocale.Country;
-icu::Locale 
bLocale((char*)(OUStringToOString(strLang,RTL_TEXTENCODING_MS_1252).getStr()),
-
(char*)(OUStringToOString(strCountry,RTL_TEXTENCODING_MS_1252).getStr()));
-
-icu::DateFormat* fmt = 
icu::DateFormat::createTimeInstance(icu::DateFormat::DEFAULT,bLocale);
+icu::Locale aLocale( LanguageTagIcu::getIcuLocale( 
Application::GetSettings().GetLanguageTag()));
 //2 get icu format pattern by locale
+icu::DateFormat* fmt = 
icu::DateFormat::createTimeInstance(icu::DateFormat::DEFAULT,aLocale);
+
 int32_t nLength = 0;
 int32_t nLengthNeed;
 UErrorCode status = U_ZERO_ERROR;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I048d72c0cd633e3aa9e6a74e4f111703969b1d77
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Eike Rathke 

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

[PATCH] introduced libi18nlangtagicu

[Eike Rathke (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3665

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/65/3665/1

introduced libi18nlangtagicu

Change-Id: Ie80e989d55d465e127ccc20290d654acf222e5bb
---
M Library_merged.mk
M Repository.mk
M RepositoryModule_host.mk
A i18nlangtag/Library_i18nlangtagicu.mk
M i18nlangtag/Module_i18nlangtag.mk
A i18nlangtag/source/languagetag/languagetagicu.cxx
M include/i18nlangtag/languagetag.hxx
A include/i18nlangtag/languagetagicu.hxx
8 files changed, 117 insertions(+), 0 deletions(-)



diff --git a/Library_merged.mk b/Library_merged.mk
index 2d5ef60..4603bda 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -33,6 +33,7 @@
cppu \
cppuhelper \
i18nlangtag \
+   i18nlangtagicu \
$(if $(filter TRUE,$(SOLAR_JAVA)), \
jvmaccess \
jvmfwk) \
diff --git a/Repository.mk b/Repository.mk
index 0ccc03d..2094721a 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -469,6 +469,7 @@
deployment \
fileacc \
i18nlangtag \
+   i18nlangtagicu \
i18nutil \
mcnttype \
package2 \
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 1b939f1..e504cdc 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -80,6 +80,7 @@
hwpfilter \
$(call gb_Helper_optional,HYPHEN,hyphen) \
i18nlangtag \
+   i18nlangtagicu \
i18npool \
i18nutil \
$(call gb_Helper_optional,ICU,icu) \
diff --git a/i18nlangtag/Library_i18nlangtagicu.mk 
b/i18nlangtag/Library_i18nlangtagicu.mk
new file mode 100644
index 000..d1def1b
--- /dev/null
+++ b/i18nlangtag/Library_i18nlangtagicu.mk
@@ -0,0 +1,32 @@
+# -*- 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_Library_Library,i18nlangtagicu))
+
+$(eval $(call gb_Library_use_sdk_api,i18nlangtagicu))
+
+$(eval $(call gb_Library_add_defs,i18nlangtagicu,\
+   -DI18NLANGTAG_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_use_libraries,i18nlangtagicu,\
+   sal \
+   i18nlangtag \
+   $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_Library_use_externals,i18nlangtagicu,\
+   icu_headers \
+   icuuc \
+))
+
+$(eval $(call gb_Library_add_exception_objects,i18nlangtagicu,\
+   i18nlangtag/source/languagetag/languagetagicu \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/i18nlangtag/Module_i18nlangtag.mk 
b/i18nlangtag/Module_i18nlangtag.mk
index edd2e1d..22b8a7f 100644
--- a/i18nlangtag/Module_i18nlangtag.mk
+++ b/i18nlangtag/Module_i18nlangtag.mk
@@ -10,6 +10,7 @@
 
 $(eval $(call gb_Module_add_targets,i18nlangtag,\
Library_i18nlangtag \
+   Library_i18nlangtagicu \
 ))
 
 $(eval $(call gb_Module_add_check_targets,i18nlangtag,\
diff --git a/i18nlangtag/source/languagetag/languagetagicu.cxx 
b/i18nlangtag/source/languagetag/languagetagicu.cxx
new file mode 100644
index 000..6f426d6
--- /dev/null
+++ b/i18nlangtag/source/languagetag/languagetagicu.cxx
@@ -0,0 +1,36 @@
+/* -*- 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 "i18nlangtag/languagetagicu.hxx"
+#include "i18nlangtag/languagetag.hxx"
+
+
+// static
+icu::Locale LanguageTagIcu::getIcuLocale( const LanguageTag & rLanguageTag )
+{
+if (rLanguageTag.isIsoLocale())
+{
+// The simple case.
+const com::sun::star::lang::Locale& rLocale = rLanguageTag.getLocale();
+if (rLocale.Country.isEmpty())
+return icu::Locale( OUStringToOString( rLocale.Language, 
RTL_TEXTENCODING_ASCII_US).getStr());
+return icu::Locale(
+OUStringToOString( rLocale.Language, 
RTL_TEXTENCODING_ASCII_US).getStr(),
+OUStringToOString( rLocale.Country, 
RTL_TEXTENCODING_ASCII_US).getStr());
+}
+
+/* TODO: could we optimize this for the isIsoODF() case where only a script
+ * is added? */
+
+// Let ICU decide how it wants a BCP47 string stuffed into its Locale.
+return icu::Locale::createFromName(
+OUStringToOString( rLanguageTag.getBcp47(), 
RTL_TEXTENCODING_ASCII_US).getStr());
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/i18nlangtag/languagetag.hxx 
b/include/i18nlangtag/languagetag.hxx
index e5ba011..15ca4ec 100644
--- a/include/i18nlangtag/languagetag.hxx
+++ b/include/i18nlangtag/languagetag.hxx
@@ -393,6 +393,7 @@