Re: curl now with native SSL/TLS on Mac and WNT
Hello Michael, Thanks a lot for updating to 7.33.0 and providing a better integration with system SSL implementation. I'm not sure curl delegates the certificates database handling completely as there is a configure option to build it with a CA bundle. So these would need to be tested on windows and macos builds before advertising. The good thing I saw this morning is that Curl guys implemented the CURLINFO_CERTINFO for NSS... after 7.33.0. The patch is here: https://github.com/bagder/curl/commit/f6c335d63f2da025a0a3efde1fe59e3bb7189b70 So I'll try to backport this patch on our internal curl: that would solve the original problem and we'll at least be able to tell the users when we have some SSL certificate problem. Regards, -- Cedric On Tue, 2013-11-19 at 00:21 +0100, Michael Stahl wrote: digging through curl's makefiles it supports some native SSL/TLS implementations, which should have OS integrated support and UI for adding custom CAs and such things: commit 461bdf0b4f863a5ba39dd76b6baf416fbb64b5e8 enables use of Secure Transport on Mac / IOS commit 460d6ce526b79f4d98600d60a63f894e197b66fe enables use of Schannel on WNT (MSVC) and btw commit 88e65df2e4be47ae3ae1ae1b3a30003f4cfe4b11 upgrades to version 7.33.0 actually it appears that on WNT our internal curl didn't have any SSL/TLS support before, which is surprising (but i haven't checked 4.1, maybe that was only on master). it appears that Mac OS X 10.6 has a system libcurl.4.dylib, which could perhaps also be used; our RHEL5 baseline has a libcurl.so.3 apparently which is too old. this is build-tested only (and Mac only via tinderbox) - please test if it actually works for your use-cases. ___ 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
Re: junit autogen error?
On 11/16/2013 09:54 AM, Alexander Thurgood wrote: Le 15/11/13 13:48, Noel Grandin a écrit : You need to do: ./autogen.sh --with-junit=/opt/local/share/java/junit-4.jar or whatever your jar file name is. Having tried this for a while the day before yesterday on OSX Mavericks, with the latest hamcrest or junit from the project's download page, I can confirm that I couldn't get this to work either. There is two problems: First, recent Junit as downloaded from https://github.com/junit-team/junit/wiki/Download-and-Install is split in two jars of which the junit-4.11.jar does not include the hamcrest-core-1.3.jar on its manifest Class-Path. What worked for me is to run the attached Makefile and junit-manifest from some directory X and include --with-junit=X/junit.jar in LO's autogen.input. However, the second problem is that LO's configure.ac manually inspects the given junit.jar to check it contains the class files of both junit and hamcrest. The attached configure.patch improves on that by instead using javah with -classpath junit.jar to check that the class files of both junit and hamcrest are available through the given junit.jar. But that trick apparently does not work with all versions of javah, so I did not push that patch. The best fix probably is to use javac with -classpath junit.jar for the check. Stephan diff --git a/configure.ac b/configure.ac index 44dcde8..26c1147 100644 --- a/configure.ac +++ b/configure.ac @@ -11979,13 +11979,14 @@ if test $ENABLE_JAVA != -a $with_junit != no; then if test $_os = WINNT; then OOO_JUNIT_JAR=`cygpath -m $OOO_JUNIT_JAR` fi -$JAVA_HOME/bin/jar tf $OOO_JUNIT_JAR 25 | \ -grep org/junit/Before.class /dev/null 25 -if test $? -eq 0; then +if $JAVA_HOME/bin/javah -o conftestj -classpath $OOO_JUNIT_JAR \ +org.junit.Before /dev/null 25 +then # check if either class-path entry is available for hamcrest or # it's bundled -if $JAVA_HOME/bin/jar tf $OOO_JUNIT_JAR |$GREP -q hamcrest || \ -$UNZIP -c $OOO_JUNIT_JAR META-INF/MANIFEST.MF |$GREP 'Class-Path:' | $GREP -q 'hamcrest'; then +if $JAVA_HOME/bin/javah -o conftestj -classpath $OOO_JUNIT_JAR \ +org.hamcrest.BaseDescription /dev/null 25 +then AC_MSG_RESULT([$OOO_JUNIT_JAR]) else AC_MSG_ERROR([your junit jar neither sets a classpath nor includes hamcrest; please @@ -11997,6 +11998,7 @@ provide a full junit jar or use --without-junit]) location (/usr/share/java), specify its pathname via --with-junit=..., or disable it via --without-junit]) fi +rm conftestj if test $OOO_JUNIT_JAR != ; then BUILD_TYPE=$BUILD_TYPE QADEVOOO fi Class-Path: junit-4.11.jar hamcrest-core-1.3.jar junit.jar: hamcrest-core-1.3.jar junit-4.11.jar junit-manifest jar cmf junit-manifest junit.jar hamcrest-core-1.3.jar: wget http://search.maven.org/remotecontent?filepath=org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar -O hamcrest-core-1.3.jar junit-4.11.jar: wget http://search.maven.org/remotecontent?filepath=junit/junit/4.11/junit-4.11.jar -O junit-4.11.jar ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] buildbot.git: tb/tb_internals.sh
tb/tb_internals.sh |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit fd41e2ce10518e88de2d3ccfaefd9b8e33a7c364 Author: Jan Holesovsky ke...@collabora.com Date: Tue Nov 19 09:10:10 2013 +0100 Cleanup after a gerrit build. When the tinderbox runs so that it does incremental builds, it can get confused by a gerrit build with different configure settings; so clean after the gerrit tinderbox build. diff --git a/tb/tb_internals.sh b/tb/tb_internals.sh index b18c93c..32f7689 100644 --- a/tb/tb_internals.sh +++ b/tb/tb_internals.sh @@ -792,8 +792,8 @@ run_gerrit_task() # if prepare repor failed R is no 0 anymore if [ ${R} == 0 ] ; then # gerrit build are not incremental -# always use all the phases -local phase_list=autogen clean make test push +# always use all the phases and cleanup after yourself +local phase_list=autogen clean make test push clean pushd ${TB_BUILD_DIR?} /dev/null || die Cannot cd to build dir : ${TB_BUILD_DIR?} ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/oox/formulabuffer.cxx |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit ccc297097891e62489e5d281a4ea128ec6b71361 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Nov 19 09:20:46 2013 +0100 -Werror,-Wunused-private-field Change-Id: I8832317e23691531e7c5c51f9f1572ce6962e5a3 diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx index d1cf118..4303b41 100644 --- a/sc/source/filter/oox/formulabuffer.cxx +++ b/sc/source/filter/oox/formulabuffer.cxx @@ -58,7 +58,7 @@ public: }; CachedTokenArray( ScDocument rDoc ) : -mrDoc(rDoc), maCxt(rDoc, formula::FormulaGrammar::GRAM_OOXML) {} +maCxt(rDoc, formula::FormulaGrammar::GRAM_OOXML) {} ~CachedTokenArray() { @@ -106,7 +106,6 @@ public: private: typedef boost::unordered_mapSCCOL, Item* ColCacheType; ColCacheType maCache; -ScDocument mrDoc; sc::TokenStringContext maCxt; }; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Vendors Name via UNO API / Basic Macros
On 18/11/2013 22:21, Lionel Elie Mamane wrote: On Mon, Nov 18, 2013 at 09:10:34PM +0100, David Ostrovsky wrote: Lionel Elie Mamane wrote on Mon Nov 18 09:32:57 PST 2013 On Mon, Nov 18, 2013 at 06:10:34PM +0100, Fernand Vanrie wrote: yep conversions are not the problem, its the exiting code who is broken in many places ? What exiting code? This Basic-Macros excerpt: oDlg.getControl(myDateField).date = CDatetoIso(now()) was broken in LibreOffice 4.1.1. The only known migration path is to adjust all broken places with: REM broken oDlg.getControl(myDateField).date = CDatetoIso(now()) dim oDat as new com.sun.star.util.Date with oDat .day = Day(now) .month = Month(now) .year = Year(now) end with oDlg.getControl(myDateField).date = oDat Now, if you have thousands LoC of Basic Macros, ... I had understood exiting code as the return value of a procedure, so I was completely lost as to what was meant. I now understand that Fernand meant exiSting code, where code is not a value (a number / string), but a piece of program. On a sidenote, oDlg.getControl(myDateField).date = CDatetoIso(now()) can be replaced by oDlg.getControl(myDateField).date = CDateToUnoDate(now()) Lionel, Do you mean dat going back to dlg.getControl(myDateField).date as Isovalue and adding a dlg.getControl(myDateField).cdate is not option anymore ? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/appl/shutdowniconaqua.mm |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e636f5768c8843f5c177a2643f3ac8f188a51cb0 Author: Noel Grandin n...@peralex.com Date: Tue Nov 19 10:34:48 2013 +0200 fix compile error - remove bracket I messed this up this when doing commit 2c35fff7eca3a143d28dc75e6a73fe1101d2af77 remove most use of RTL_CONSTASCII_USTRINGPARAM macro Change-Id: I2edd094cfdf9ae83d5d2a7a2ab13932277f589c1 diff --git a/sfx2/source/appl/shutdowniconaqua.mm b/sfx2/source/appl/shutdowniconaqua.mm index 64b0f14..2b922dc 100644 --- a/sfx2/source/appl/shutdowniconaqua.mm +++ b/sfx2/source/appl/shutdowniconaqua.mm @@ -451,7 +451,7 @@ void aqua_init_systray() // insert entry for startcenter if( aModuleOptions.IsModuleInstalled( SvtModuleOptions::E_SSTARTMODULE ) ) { -appendMenuItem( pMenu, nil, pShutdownIcon-GetResString( STR_QUICKSTART_STARTCENTER ), MI_STARTMODULE, OUString( n ) ) ); +appendMenuItem( pMenu, nil, pShutdownIcon-GetResString( STR_QUICKSTART_STARTCENTER ), MI_STARTMODULE, OUString( n ) ); if( [NSApp respondsToSelector: @selector(setDockIconClickHandler:)] ) [NSApp performSelector:@selector(setDockIconClickHandler:) withObject: pExecute]; else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/coretext
vcl/coretext/salgdi2.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 03b0ee801e4ba894eed0ba33ffd8b84aea9aca99 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Nov 19 10:07:15 2013 +0100 Typo Change-Id: Ibd12f919cb50f3f8e67fd559a332a1c6eda3c74e diff --git a/vcl/coretext/salgdi2.cxx b/vcl/coretext/salgdi2.cxx index 594670c..9d3bae0 100644 --- a/vcl/coretext/salgdi2.cxx +++ b/vcl/coretext/salgdi2.cxx @@ -304,7 +304,7 @@ AquaSalGraphics::AquaSalGraphics() AquaSalGraphics::~AquaSalGraphics() { -#ifdef MAXOSX +#ifdef MACOSX CGPathRelease( mxClipPath ); delete mpMacTextStyle; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'feature/notes-refactoring'
New branch 'feature/notes-refactoring' available with the following commits: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |3 +++ writerfilter/source/dmapper/GraphicImport.cxx |1 + 2 files changed, 4 insertions(+) New commits: commit f0d9beb80f926a05bc7dd87801c6daa7bc268cec Author: Miklos Vajna vmik...@collabora.co.uk Date: Tue Nov 19 10:10:42 2013 +0100 DOCX drawingML shape import: handle margins Change-Id: Ia89552658dc79568cc46b92e949fc1935434e43d diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index b399ef5..f4df997 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1514,6 +1514,9 @@ DECLARE_OOXMLIMPORT_TEST(testWpsOnly, wps-only.docx) // Check position, it was 0. This is a shape, so use getPosition(), not a property. CPPUNIT_ASSERT_EQUAL(sal_Int32(EMU_TO_MM100(671830)), xShape-getPosition().X); + +// Left margin was 0, instead of 114300 EMU's. +CPPUNIT_ASSERT_EQUAL(sal_Int32(318), getPropertysal_Int32(xShape, LeftMargin)); } DECLARE_OOXMLIMPORT_TEST(testFdo70457, fdo70457.docx) diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 64b0561..e75449f 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -1000,6 +1000,7 @@ void GraphicImport::lcl_attribute(Id nName, Value val) xShapeProps-setPropertyValue(AnchorType, uno::makeAny(text::TextContentAnchorType_AT_CHARACTER)); m_xShape-setPosition(awt::Point(m_pImpl-nLeftPosition, m_pImpl-nTopPosition)); +m_pImpl-applyMargins(xShapeProps); } } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/msfilter/msdffimp.cxx |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit 3b0e3e3797072b10738086911488cba86d840e69 Author: Andras Timar andras.ti...@collabora.com Date: Tue Nov 19 11:08:09 2013 +0100 fdo#66854 keep shadow distance of non-supported MSO shadow type this is a slight improvement of d7367b709dc4e97714fb2084b872a96389e768fb the rendering of star from #i119634# bugdoc was kept the rendering of the yellow circle shadows from fdo#66854 bugdoc was improved Change-Id: Ife53328ef665131fb954eb33c2e8269ad10da0fe diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 27ca4a9..c0db6dc 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -2522,6 +2522,7 @@ void DffPropertyReader::ApplyAttributes( SvStream rIn, SfxItemSet rSet ) const void DffPropertyReader::ApplyAttributes( SvStream rIn, SfxItemSet rSet, DffObjData rObjData ) const { sal_Bool bHasShadow = sal_False; +bool bNonZeroShadowOffset = false; if ( IsProperty( DFF_Prop_gtextSize ) ) rSet.Put( SvxFontHeightItem( rManager.ScalePt( GetPropertyValue( DFF_Prop_gtextSize ) ), 100, EE_CHAR_FONTHEIGHT ) ); @@ -2554,12 +2555,14 @@ void DffPropertyReader::ApplyAttributes( SvStream rIn, SfxItemSet rSet, DffObj sal_Int32 nVal = static_cast sal_Int32 ( GetPropertyValue( DFF_Prop_shadowOffsetX ) ); rManager.ScaleEmu( nVal ); rSet.Put( SdrShadowXDistItem( nVal ) ); +bNonZeroShadowOffset = ( nVal 0 ); } if ( IsProperty( DFF_Prop_shadowOffsetY ) ) { sal_Int32 nVal = static_cast sal_Int32 ( GetPropertyValue( DFF_Prop_shadowOffsetY ) ); rManager.ScaleEmu( nVal ); rSet.Put( SdrShadowYDistItem( nVal ) ); +bNonZeroShadowOffset = ( nVal 0 ); } if ( IsProperty( DFF_Prop_fshadowObscured ) ) { @@ -2575,7 +2578,7 @@ void DffPropertyReader::ApplyAttributes( SvStream rIn, SfxItemSet rSet, DffObj if ( IsProperty( DFF_Prop_shadowType ) ) { MSO_ShadowType eShadowType = static_cast MSO_ShadowType ( GetPropertyValue( DFF_Prop_shadowType ) ); -if( eShadowType != mso_shadowOffset ) +if( eShadowType != mso_shadowOffset !bNonZeroShadowOffset ) { //0.12 == 173 twip == 302 100mm sal_uInt32 nDist = rManager.pSdrModel-GetScaleUnit() == MAP_TWIP ? 173: 302; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: scripts/esc-bug-stats.pl
scripts/esc-bug-stats.pl |2 ++ 1 file changed, 2 insertions(+) New commits: commit 0920ab0a8c3df7d414a09a0d96a2de10f4b93208 Author: Michael Meeks michael.me...@collabora.com Date: Tue Nov 19 10:39:20 2013 + annotate more bug closers. diff --git a/scripts/esc-bug-stats.pl b/scripts/esc-bug-stats.pl index 0b739ff..313ddf6 100755 --- a/scripts/esc-bug-stats.pl +++ b/scripts/esc-bug-stats.pl @@ -13,6 +13,8 @@ my %sadly_non_libreoffice = ( 'Marek Olšák' = 1, 'Emil Velikov' = 1, 'ajax at nwnk dot net' = 1, +'Jesse Barnes' = 1, +'Albert Astals Cid' = 1, ); # use me for testing XML pretty printing etc. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/tml/opencl-background-compilation' - sc/inc sc/qa sc/source
sc/inc/formulagroup.hxx | 128 +++ sc/inc/formulagroupcontext.hxx | 76 -- sc/inc/formulagroupinterpreter.hxx | 76 -- sc/qa/unit/opencl-test.cxx |2 sc/source/core/data/column2.cxx |2 sc/source/core/data/documen2.cxx |2 sc/source/core/data/documen7.cxx |2 sc/source/core/data/document.cxx |2 sc/source/core/data/formulacell.cxx |2 sc/source/core/inc/dynamickernel.hxx |2 sc/source/core/opencl/formulagroupcl.cxx |2 sc/source/core/tool/clkernelthread.cxx |2 sc/source/core/tool/formulagroup.cxx |3 sc/source/core/tool/formulaopt.cxx |2 sc/source/core/tool/interpr5.cxx |2 sc/source/ui/optdlg/calcoptionsdlg.cxx |2 16 files changed, 141 insertions(+), 166 deletions(-) New commits: commit 8efe73fcd4c3b9d7ed45021764f57265e1bc7225 Author: Tor Lillqvist t...@collabora.com Date: Tue Nov 19 11:16:34 2013 +0200 Don't split groupcontext.hxx after all Change-Id: Ie829765f7d9a6e7ba8b99d8fc973537a2576581f diff --git a/sc/inc/formulagroup.hxx b/sc/inc/formulagroup.hxx new file mode 100644 index 000..7cb055e --- /dev/null +++ b/sc/inc/formulagroup.hxx @@ -0,0 +1,128 @@ +/* -*- 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 address.hxx +#include types.hxx +#include platforminfo.hxx + +#include svl/sharedstringpool.hxx + +#include vector +#include boost/noncopyable.hpp +#include boost/ptr_container/ptr_vector.hpp +#include boost/unordered_set.hpp + +class ScDocument; +class ScTokenArray; + +namespace sc { + +struct FormulaGroupContext : boost::noncopyable +{ +typedef std::vectordouble NumArrayType; +typedef std::vectorrtl_uString* StrArrayType; +typedef boost::ptr_vectorNumArrayType NumArrayStoreType; +typedef boost::ptr_vectorStrArrayType StrArrayStoreType; + +struct ColKey +{ +SCTAB mnTab; +SCCOL mnCol; + +struct Hash +{ +size_t operator() ( const ColKey rKey ) const; +}; + +ColKey( SCTAB nTab, SCCOL nCol ); + +bool operator== ( const ColKey r ) const; +bool operator!= ( const ColKey r ) const; +}; + +struct ColArray +{ +NumArrayType* mpNumArray; +StrArrayType* mpStrArray; +size_t mnSize; + +ColArray( NumArrayType* pNumArray, StrArrayType* pStrArray ); +}; + +typedef boost::unordered_mapColKey, ColArray, ColKey::Hash ColArraysType; + +NumArrayStoreType maNumArrays; /// manage life cycle of numeric arrays. +StrArrayStoreType maStrArrays; /// manage life cycle of string arrays. + +ColArraysType maColArrays; /// keep track of longest array for each column. + +ColArray* getCachedColArray( SCTAB nTab, SCCOL nCol, size_t nSize ); + +ColArray* setCachedColArray( +SCTAB nTab, SCCOL nCol, NumArrayType* pNumArray, StrArrayType* pStrArray ); + +void ensureStrArray( ColArray rColArray, size_t nArrayLen ); +void ensureNumArray( ColArray rColArray, size_t nArrayLen ); +}; + +/** + * Abstract base class for a compiled formula + */ +class SC_DLLPUBLIC CompiledFormula +{ +}; + +/** + * Abstract base class for vectorised formula group interpreters, + * plus a global instance factory. + */ +class SC_DLLPUBLIC FormulaGroupInterpreter +{ +static FormulaGroupInterpreter *msInstance; + protected: +FormulaGroupInterpreter() {} +virtual ~FormulaGroupInterpreter() {} + + public: +static FormulaGroupInterpreter *getStatic(); +static void fillOpenCLInfo(std::vectorOpenclPlatformInfo rPlatforms); +static bool switchOpenCLDevice(const OUString rDeviceId, bool bAutoSelect); +static void enableOpenCL(bool bEnable); + +virtual ScMatrixRef inverseMatrix(const ScMatrix rMat) = 0; +virtual CompiledFormula* createCompiledFormula(ScDocument rDoc, + const ScAddress rTopPos, + ScFormulaCellGroupRef xGroup, + ScTokenArray rCode) = 0; +virtual bool interpret(ScDocument rDoc, const ScAddress rTopPos, ScFormulaCellGroupRef xGroup, ScTokenArray rCode) = 0; +}; + +/// Inherit from this for alternate formula group calculation approaches. +class SC_DLLPUBLIC FormulaGroupInterpreterSoftware : public FormulaGroupInterpreter +{ +public: +FormulaGroupInterpreterSoftware(); +virtual ~FormulaGroupInterpreterSoftware() {} + +virtual ScMatrixRef inverseMatrix(const
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |2 ++ writerfilter/source/dmapper/GraphicImport.cxx |1 + 2 files changed, 3 insertions(+) New commits: commit 02a2203580226766c4b3b8778430774ff76f90e9 Author: Miklos Vajna vmik...@collabora.co.uk Date: Tue Nov 19 11:34:49 2013 +0100 DOCX drawingML shape import: handle wrap type Change-Id: I8880c7413b10a284c9e55170afa35527dc7593ea diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index f4df997..14c8ba5 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1517,6 +1517,8 @@ DECLARE_OOXMLIMPORT_TEST(testWpsOnly, wps-only.docx) // Left margin was 0, instead of 114300 EMU's. CPPUNIT_ASSERT_EQUAL(sal_Int32(318), getPropertysal_Int32(xShape, LeftMargin)); +// Wrap type was PARALLEL. +CPPUNIT_ASSERT_EQUAL(text::WrapTextMode_THROUGHT, getPropertytext::WrapTextMode(xShape, Surround)); } DECLARE_OOXMLIMPORT_TEST(testFdo70457, fdo70457.docx) diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index e75449f..da957ce 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -1001,6 +1001,7 @@ void GraphicImport::lcl_attribute(Id nName, Value val) m_xShape-setPosition(awt::Point(m_pImpl-nLeftPosition, m_pImpl-nTopPosition)); m_pImpl-applyMargins(xShapeProps); +xShapeProps-setPropertyValue(Surround, uno::makeAny(m_pImpl-nWrap)); } } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source dbaccess/source desktop/source extensions/source framework/source reportdesign/source sc/source sfx2/source svx/source toolkit/source vcl/unx xmloff
connectivity/source/drivers/jdbc/DatabaseMetaData.cxx|4 dbaccess/source/core/api/FilteredContainer.cxx |4 dbaccess/source/ui/dlg/tablespage.cxx|2 desktop/source/migration/migration.cxx |2 extensions/source/update/feed/updatefeed.cxx |2 framework/source/uielement/comboboxtoolbarcontroller.cxx | 38 +++--- framework/source/uielement/dropdownboxtoolbarcontroller.cxx | 26 ++-- framework/source/uielement/edittoolbarcontroller.cxx |4 framework/source/uielement/imagebuttontoolbarcontroller.cxx |6 - framework/source/uielement/spinfieldtoolbarcontroller.cxx| 32 ++--- framework/source/uielement/togglebuttontoolbarcontroller.cxx | 26 ++-- framework/source/uielement/toolbarwrapper.cxx|2 framework/source/uifactory/addonstoolboxfactory.cxx |6 - reportdesign/source/filter/xml/xmlExport.cxx |2 sc/source/core/tool/formulaopt.cxx |4 sc/source/filter/xml/XMLTrackedChangesContext.cxx|2 sc/source/filter/xml/xmlcvali.cxx|4 sc/source/filter/xml/xmlexprt.cxx|2 sc/source/ui/app/inputhdl.cxx|8 - sfx2/source/control/unoctitm.cxx | 10 - svx/source/xoutdev/xattr.cxx |4 toolkit/source/controls/dialogcontrol.cxx|2 toolkit/source/controls/unocontrol.cxx | 14 +- vcl/unx/generic/dtrans/X11_selection.cxx | 10 - xmloff/source/draw/XMLImageMapExport.cxx |3 xmloff/source/script/XMLEventExport.cxx |2 xmloff/source/text/txtflde.cxx | 66 +-- xmloff/source/text/txtparae.cxx |3 28 files changed, 143 insertions(+), 147 deletions(-) New commits: commit 363cc397172f2b0a94d9c4dc44fc8d95072795a3 Author: Noel Grandin n...@peralex.com Date: Tue Nov 19 12:47:37 2013 +0200 convert equalsAsciiL calls to startWith calls where possible Simplify code like: aStr.equalsAsciiL( %, 1 ) to aStr.startsWith( % ) Change-Id: Iee0e4e60b0ae6d567fa8f72db5d616fffbec3c00 diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx index 1b24993..c257a39 100644 --- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx +++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx @@ -135,7 +135,7 @@ Reference XResultSet SAL_CALL java_sql_DatabaseMetaData::getTables( bool bIncludeAllTypes = false; for ( sal_Int32 i=0; itypeFilterCount; ++i, ++typeFilter ) { -if ( typeFilter-equalsAsciiL( %, 1 ) ) +if ( typeFilter-startsWith( % ) ) { bIncludeAllTypes = true; break; @@ -163,7 +163,7 @@ Reference XResultSet SAL_CALL java_sql_DatabaseMetaData::getTables( aCatalogFilter = m_pConnection-getCatalogRestriction(); // similar for schema Any aSchemaFilter; -if ( schemaPattern.equalsAsciiL( %, 1 ) ) +if ( schemaPattern.startsWith( % ) ) aSchemaFilter = m_pConnection-getSchemaRestriction(); else aSchemaFilter = schemaPattern; diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx index 58d102d..dfa656c 100644 --- a/dbaccess/source/core/api/FilteredContainer.cxx +++ b/dbaccess/source/core/api/FilteredContainer.cxx @@ -168,7 +168,7 @@ sal_Int32 createWildCardVector(Sequence OUString _rTableFilter, ::std::vecto // first, filter for the table names sal_Int32 nTableFilterCount = _tableFilter.getLength(); -sal_Bool dontFilterTableNames = ( ( nTableFilterCount == 1 ) _tableFilter[0].equalsAsciiL( %, 1 ) ); +sal_Bool dontFilterTableNames = ( ( nTableFilterCount == 1 ) _tableFilter[0].startsWith( % ) ); if( dontFilterTableNames ) { aFilteredTables = _unfilteredTables; @@ -198,7 +198,7 @@ sal_Int32 createWildCardVector(Sequence OUString _rTableFilter, ::std::vecto // second, filter for the table types sal_Int32 nTableTypeFilterCount = _tableTypeFilter.getLength(); -sal_Bool dontFilterTableTypes = ( ( nTableTypeFilterCount == 1 ) _tableTypeFilter[0].equalsAsciiL( %, 1 ) ); +sal_Bool dontFilterTableTypes = ( ( nTableTypeFilterCount == 1 ) _tableTypeFilter[0].startsWith( % ) ); dontFilterTableTypes = dontFilterTableTypes || ( nTableTypeFilterCount == 0 ); // (for TableTypeFilter, unlike TableFilter, empty means do not filter at all) if (
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/doc/docfile.cxx | 21 + 1 file changed, 17 insertions(+), 4 deletions(-) New commits: commit 3d12549335229aca1a6a57575292111274709992 Author: matt_51 matthieu.gay@gmail.com Date: Tue Nov 5 11:40:56 2013 +0100 fdo#70345 Reuse XStream for Windows platform create a new one for others. Change-Id: I911c24b82b55445c6f95e14be29759e2fe3d9dfd Reviewed-on: https://gerrit.libreoffice.org/6580 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 3d23f50..3830b11 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -604,13 +604,26 @@ SvStream* SfxMedium::GetOutStream() if ( pImp-pTempFile ) { -// don't try to re-use XOutStream from xStream if that exists; +// On windows we try to re-use XOutStream from xStream if that exists; +// because opening new SvFileStream in this situation may fail with ERROR_SHARING_VIOLATION +#ifdef WNT +if (pImp-xStream.is()) +{ +assert(pImp-xStream-getOutputStream().is()); // need that... +pImp-m_pOutStream = utl::UcbStreamHelper::CreateStream( +pImp-xStream, false); +} +else +{ +pImp-m_pOutStream = new SvFileStream( +pImp-m_aName, STREAM_STD_READWRITE); +} +// On Unix don't try to re-use XOutStream from xStream if that exists; // it causes fdo#59022 (fails opening files via SMB on Linux) -// OTOH opening new SvFileStream in this situation may fail on -// Windows with ERROR_SHARING_VIOLATION... but that is apparently -// not a problem in practice currently +#else pImp-m_pOutStream = new SvFileStream( pImp-m_aName, STREAM_STD_READWRITE); +#endif CloseStorage(); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - 4 commits - wizards/com wizards/source
wizards/com/sun/star/wizards/agenda/AgendaDocument.py | 33 ++ wizards/com/sun/star/wizards/document/OfficeDocument.py|2 wizards/com/sun/star/wizards/letter/LetterWizardDialog.py | 32 +++-- wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py |3 wizards/com/sun/star/wizards/ui/event/DataAware.py | 16 +++- wizards/com/sun/star/wizards/ui/event/UnoDataAware.py | 21 -- wizards/source/formwizard/dbwizres.src |5 - 7 files changed, 48 insertions(+), 64 deletions(-) New commits: commit ebfc786cc673fe2624a4710ecab838dc2f84a252 Author: Xisco Fauli aniste...@gmail.com Date: Mon Nov 18 23:57:47 2013 +0100 fdo#68788: Don't use systemPathToFileUrl here it works on Linux but not on Windows. Change-Id: Ia9af362c09d46c678fa4ebe8cf4922dae3dddccf Signed-off-by: Andras Timar andras.ti...@collabora.com diff --git a/wizards/com/sun/star/wizards/document/OfficeDocument.py b/wizards/com/sun/star/wizards/document/OfficeDocument.py index eb6fb0a..35d3183 100644 --- a/wizards/com/sun/star/wizards/document/OfficeDocument.py +++ b/wizards/com/sun/star/wizards/document/OfficeDocument.py @@ -105,7 +105,7 @@ class OfficeDocument(object): xComponent = None try: xComponent = frame.loadComponentFromURL( -systemPathToFileUrl(sURL), _self, 0, tuple(loadValues)) +sURL, _self, 0, tuple(loadValues)) except Exception: traceback.print_exc() commit e0d9d5bb52ff1f2fc3efcc204ccb0e1c524182ed Author: Xisco Fauli aniste...@gmail.com Date: Sun Nov 17 19:17:12 2013 +0100 fdo#69025 Remove unused text Change-Id: I9fc60d52e1bc4b38b79e3e29ed1b04b3e8a777a1 Signed-off-by: Andras Timar andras.ti...@collabora.com diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py b/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py index e73142a..3176abd 100644 --- a/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py +++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py @@ -580,7 +580,7 @@ class LetterWizardDialog(WizardDialog): PropertyNames.PROPERTY_WIDTH), (8, HelpIds.getHelpIdString(HID + 22), self.resources.reschkUseLogo_value, -chkUseLogo, 97, 54, 0, 3, 22, 212), self) +chkUseLogo, 97, 34, 0, 3, 22, 212), self) self.chkUseAddressReceiver = self.insertCheckBox( chkUseAddressReceiver, LetterWizardDialogConst.CHKUSEADDRESSRECEIVER_ITEM_CHANGED, @@ -596,7 +596,7 @@ class LetterWizardDialog(WizardDialog): PropertyNames.PROPERTY_WIDTH), (8, HelpIds.getHelpIdString(HID + 23), self.resources.reschkUseAddressReceiver_value, -chkUseAddressReceiver, 97, 69, 0, 3, 23, 212), self) +chkUseAddressReceiver, 97, 49, 0, 3, 23, 212), self) self.chkUseSigns = self.insertCheckBox( chkUseSigns, LetterWizardDialogConst.CHKUSESIGNS_ITEM_CHANGED, @@ -612,7 +612,7 @@ class LetterWizardDialog(WizardDialog): PropertyNames.PROPERTY_WIDTH), (8, HelpIds.getHelpIdString(HID + 24), self.resources.reschkUseSigns_value, -chkUseSigns, 97, 82, 0, 3, 24, 212), self) +chkUseSigns, 97, 62, 0, 3, 24, 212), self) self.chkUseSubject = self.insertCheckBox( chkUseSubject, LetterWizardDialogConst.CHKUSESUBJECT_ITEM_CHANGED, @@ -628,7 +628,7 @@ class LetterWizardDialog(WizardDialog): PropertyNames.PROPERTY_WIDTH), (8, HelpIds.getHelpIdString(HID + 25), self.resources.reschkUseSubject_value, -chkUseSubject, 97, 98, 0, 3, 25, 212), self) +chkUseSubject, 97, 78, 0, 3, 25, 212), self) self.chkUseSalutation = self.insertCheckBox( chkUseSalutation, LetterWizardDialogConst.CHKUSESALUTATION_ITEM_CHANGED, @@ -644,7 +644,7 @@ class LetterWizardDialog(WizardDialog): PropertyNames.PROPERTY_WIDTH), (8, HelpIds.getHelpIdString(HID + 26), self.resources.reschkUseSalutation_value, -chkUseSalutation, 97, 113, 0, 3, 26, 66), self) +chkUseSalutation, 97, 93, 0, 3, 26, 66), self) self.lstSalutation = self.insertComboBox( lstSalutation, LetterWizardDialogConst.LSTSALUTATION_ACTION_PERFORMED, @@ -660,7 +660,7 @@ class LetterWizardDialog(WizardDialog): PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (True, 12, HelpIds.getHelpIdString(HID + 27), -lstSalutation, 210, 110, 3, 27, 74), self) +lstSalutation, 210, 90, 3, 27, 74), self)
[Libreoffice-commits] core.git: Branch 'feature/notes-refactoring' - 3 commits - dictionaries helpcontent2 include/svx sc/source svx/source xmloff/source
dictionaries|2 helpcontent2|2 include/svx/svdotext.hxx|7 ++ sc/source/core/data/postit.cxx | 15 ++-- sc/source/filter/xml/xmlexprt.cxx | 86 +--- sc/source/filter/xml/xmlexprt.hxx |2 svx/source/svdraw/svdobj.cxx|4 - svx/source/svdraw/svdotextdecomposition.cxx |4 - svx/source/svdraw/svdotxat.cxx | 13 +++- xmloff/source/draw/shapeexport.cxx |5 - 10 files changed, 77 insertions(+), 63 deletions(-) New commits: commit 8cabe511b5a96f7f66c4047f1535e07c2341f77f Author: Laurent Godard lgodard.li...@laposte.net Date: Tue Nov 19 12:13:11 2013 +0100 notes export current state - broken : lot of notes are lost on exporting Change-Id: I083cbdf51f7ea7bd90e6cddf15ba59abb4add1a1 diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index 46eb924..491946f 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -271,6 +271,9 @@ private: SVX_DLLPRIVATE ImpSdrObjTextLinkUserData* GetLinkUserData() const; // void ImpCheckItemSetChanges(const SfxItemSet rAttr); +// Annotation : do not process SetText until process fully achieved (hack) +bool bFreezeSetText=false; + protected: bool ImpCanConvTextToCurve() const; SdrObject* ImpConvertMakeObj(const basegfx::B2DPolyPolygon rPolyPolygon, sal_Bool bClosed, sal_Bool bBezier, sal_Bool bNoSetAttr = sal_False) const; @@ -414,9 +417,6 @@ public: SdrTextAniKind GetTextAniKind() const; SdrTextAniDirection GetTextAniDirection() const; -// Annotation : do not process SetText until process fully achieved (hack) -bool bShuntSetText=false; - virtual void SetPage(SdrPage* pNewPage); virtual void SetModel(SdrModel* pNewModel); virtual void TakeObjInfo(SdrObjTransformInfoRec rInfo) const; @@ -557,6 +557,10 @@ public: // ItemChange(), PostItemChange() and ItemSetChanged() calls. void SetObjectItemNoBroadcast(const SfxPoolItem rItem); +// Annotation : do not process SetText until process fully achieved (hack) +bool IsFreezeSetText() const; +void SetFreezeSetText(bool bFreeze); + public: // // text primitive decomposition helpers diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx index fbd0032..9d138cc 100644 --- a/sc/source/core/data/postit.cxx +++ b/sc/source/core/data/postit.cxx @@ -675,7 +675,7 @@ void ScPostIt::CreateCaptionFromInitData( const ScAddress rPos ) const { ScCaptionInitData rInitData = *maNoteData.mxInitData; -maNoteData.mpCaption-bShuntSetText=true; +maNoteData.mpCaption-SetFreezeSetText(true); // copy all items or set default items; reset shadow items ScCaptionUtil::SetDefaultItems( *maNoteData.mpCaption, mrDoc ); @@ -702,7 +702,7 @@ void ScPostIt::CreateCaptionFromInitData( const ScAddress rPos ) const aCreator.FitCaptionToRect(); } -maNoteData.mpCaption-bShuntSetText=false; +maNoteData.mpCaption-SetFreezeSetText(false); if( rInitData.mxOutlinerObj.get() ) maNoteData.mpCaption-SetOutlinerParaObject( rInitData.mxOutlinerObj.release() ); else diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 995f75a..7831a38 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -1375,6 +1375,7 @@ void ScXMLExport::ExportAnnotationsTextAutoStyles() std::vectorsc::NoteEntry aEntries; pDoc-GetAllNoteEntries(aEntries); std::vectorsc::NoteEntry::const_iterator it = aEntries.begin(), itEnd = aEntries.end(); + for (; it != itEnd; ++it) { const ScPostIt pNote = *it-mpNote; @@ -2439,7 +2440,92 @@ void ScXMLExport::_ExportAutoStyles() } // stored styles for notes + +UniReferenceSvXMLExportPropertyMapper xShapeMapper = XMLShapeExport::CreateShapePropMapper( *this ); +GetShapeExport(); // make sure the graphics styles family is added + +const std::vectorScNoteStyleEntry rNoteEntries = pSheetData-GetNoteStyles(); +std::vectorScNoteStyleEntry::const_iterator aNoteIter = rNoteEntries.begin(); +std::vectorScNoteStyleEntry::const_iterator aNoteEnd = rNoteEntries.end(); +while (aNoteIter != aNoteEnd) +{ +ScAddress aPos = aNoteIter-maCellPos; +SCTAB nTable = aPos.Tab(); +bool bCopySheet = pDoc-IsStreamValid( nTable ); +if (bCopySheet) +{ +//! separate method AddStyleFromNote
[Libreoffice-commits] core.git: bin/gbuild-to-ide .gitignore Makefile.in
.gitignore|2 Makefile.in | 10 + bin/gbuild-to-ide | 295 ++ 3 files changed, 307 insertions(+) New commits: commit ba99e296077e6bc6d6a153d01a45bd9ebe1a1d35 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Fri Nov 15 18:39:46 2013 +0100 related fdo#70414 gbuild to ide: kdevelop This provides kdevelop integration and generates one project file for each old-style module (top level dir). This project file has: - has four build configurations: - build the module of the project or build all of LibreOffice - for each of the above a debug and a nondebug build - has seven launch targets: - running the unitchecks, the slowchecks and subsequentchecks - for each of the above once for the module and once for all - running LibreOffice interactively - has custom include paths and thus provides full autocompletion Change-Id: I6dd51133147d019fc403e3bd814bc6103df94cac Reviewed-on: https://gerrit.libreoffice.org/6694 Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com Tested-by: Björn Michaelsen bjoern.michael...@canonical.com diff --git a/.gitignore b/.gitignore index 4680de1..0de9054 100644 --- a/.gitignore +++ b/.gitignore @@ -58,6 +58,8 @@ *~ .*sw? \#* +*.kdev4 +.kdev_include_paths # things below this point are targeted for elimination diff --git a/Makefile.in b/Makefile.in index 95bf5b3..443f758 100644 --- a/Makefile.in +++ b/Makefile.in @@ -400,6 +400,16 @@ subsequentcheck :| $(if $(filter-out subsequentcheck,$(MAKECMDGOALS)),build) debugrun help slowcheck translations unitcheck : $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@ +define GbuildToIdeIntegration +$(1)-ide-integration: + cd $(SRCDIR) (make cmd -npf Makefile.gbuild all || true) | $(SRCDIR)/bin/gbuild-to-ide --ide $(1) + +endef + +$(foreach ide,\ + kdevelop, \ +$(eval $(call GbuildToIdeIntegration,$(ide + endif # MAKE_RESTARTS # vim: set noet sw=4 ts=4: diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide new file mode 100755 index 000..d18ee84 --- /dev/null +++ b/bin/gbuild-to-ide @@ -0,0 +1,295 @@ +#! /usr/bin/env python3 +# -*- Mode: python; 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/. +# + +import argparse +import inspect +import os +import os.path +import shutil +import re +import sys + +class GbuildParserState: +def __init__(self): +self.include = [] +self.defs = {} +self.cxxobjects = [] +self.linked_libs = [] + +class GbuildLinkTarget: +def __init__(self, name, location, include, defs, cxxobjects, linked_libs): +(self.name, self.location, self.include, self.defs, self.cxxobjects, self.linked_libs) = (name, location, include, defs, cxxobjects, linked_libs) +def short_name(self): +return self.name +def __str__(self): +return '%s at %s with include path: %s, defines %s, objects: %s and linked libs: %s' % (self.short_name(), self.location, self.include, self.defs, self.cxxobjects, self.linked_libs) + +class GbuildLib(GbuildLinkTarget): +def __init__(self, name, location, include, defs, cxxobjects, linked_libs): +GbuildLinkTarget.__init__(self, name, location, include, defs, cxxobjects, linked_libs) +def short_name(self): +return 'Library %s' % self.name + +class GbuildExe(GbuildLinkTarget): +def __init__(self, name, location, include, defs, cxxobjects, linked_libs): +GbuildLinkTarget.__init__(self, name, location, include, defs, cxxobjects, linked_libs) +def short_name(self): +return 'Executable %s' % self.name + +class GbuildParser: +makecmdpattern = re.compile('^MAKE_COMMAND := (.*)') +srcdirpattern = re.compile('^SRCDIR = (.*)') +builddirpattern = re.compile('^BUILDDIR = (.*)') +instdirpattern = re.compile('^INSTDIR = (.*)') +libpattern = re.compile('# [a-z]+ to execute \(from `(.*)/Library_(.*)\.mk\', line [0-9]*\):') +exepattern = re.compile('# [a-z]+ to execute \(from `(.*)/Executable_(.*)\.mk\', line [0-9]*\):') +includepattern = re.compile('# INCLUDE := (.*)') +defspattern = re.compile('# DEFS := (.*)') +cxxpattern = re.compile('# CXXOBJECTS := (.*)') +linkedlibspattern = re.compile('# LINKED_LIBS := (.*)') +def __init__(self): +(self.makecmd, self.srcdir, self.builddir, self.instdir, self.libs, self.exes) = ('', '', '', '', [], []) +def parse(self, gbuildstate): +state = GbuildParserState() +for line in gbuildstate: +if not line.startswith('#'): +makecmdmatch = GbuildParser.makecmdpattern.match(line) +
[Libreoffice-commits] core.git: embedserv/source
embedserv/source/embed/docholder.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit debde4fdc443f522562ee29def4c27512d64609a Author: Andras Timar andras.ti...@collabora.com Date: Tue Nov 19 12:40:38 2013 +0100 fdo#66232 fix opening files via COM server Thanks to Noel Grandin Stephan Bergmann for the hint on IRC. Change-Id: I2b407a53b02a7ecdbff553ad47674c1e00455180 diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx index 885ba91..ed0858f 100644 --- a/embedserv/source/embed/docholder.cxx +++ b/embedserv/source/embed/docholder.cxx @@ -354,7 +354,7 @@ HRESULT DocumentHolder::InPlaceActivate( m_xFrame-registerDispatchProviderInterceptor( CreateNewInterceptor() ); -m_xLayoutManager.set( m_xFrame-getLayoutManager(), uno::UNO_QUERY_THROW ); +m_xLayoutManager.set( m_xFrame-getLayoutManager(), uno::UNO_QUERY ); if(m_xLayoutManager.is()) m_xLayoutManager-setDockingAreaAcceptor(this); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 66232, which changed state. Bug 66232 Summary: FILEOPEN: cannot open .odt files by clicking on a hyperlink in IE https://bugs.freedesktop.org/show_bug.cgi?id=66232 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Dev-Environment with Vagrant/VirtualBox?
Hi, On Mon, Nov 18, 2013 at 11:16:38AM +0100, Michael Stahl wrote: on the other hand, if the newbies do the build themselves they will get a sense of having achieved something. which we can of course help by only releasing image with a git repo at a revision that does in fact build ;) Absolutely yes to the second. Some reservations about the first: While doing a build might feel encouraging, its not too rare that newcomers somehow mess up their tree and since they are insecure are not sure if they can fix that in ways an experienced dev confidently does. As such, having a one-click way to get back to that 'just after build'-state is certainly very comforting. OTOH this is in a VM -- If we somehow inject a big fat Your build just finished, you should REALLY create a snapshot of the VM right now at the end of the build, that might be helpful too (e.g. via solenv/gbuild/extensions). Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 70414] create VSProject files for code editing in MSVS from gbuild
https://bugs.freedesktop.org/show_bug.cgi?id=70414 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard|EasyHack|EasyHack |DifficultyInteresting |DifficultyInteresting |SkillScript |SkillScript target:4.2.0 --- Comment #1 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Bjoern Michaelsen committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=ba99e296077e6bc6d6a153d01a45bd9ebe1a1d35 related fdo#70414 gbuild to ide: kdevelop The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: winaccessibility/CustomTarget_ia2_idl.mk winaccessibility/inc winaccessibility/Library_uacccom.mk winaccessibility/Library_winaccessibility.mk winaccessibility/Module_w
0 files changed New commits: commit a790a0e4e9d4e60aece526c53b452d46f2d8e561 Author: Michael Stahl mst...@redhat.com Date: Tue Nov 19 12:57:55 2013 +0100 winaccessibility: remove executable bits Change-Id: I691c5fc3554bcdeb6c3beb0e5b445cfcd7b51e4c diff --git a/winaccessibility/CustomTarget_ia2_idl.mk b/winaccessibility/CustomTarget_ia2_idl.mk old mode 100755 new mode 100644 diff --git a/winaccessibility/Library_uacccom.mk b/winaccessibility/Library_uacccom.mk old mode 100755 new mode 100644 diff --git a/winaccessibility/Library_winaccessibility.mk b/winaccessibility/Library_winaccessibility.mk old mode 100755 new mode 100644 diff --git a/winaccessibility/Module_winaccessibility.mk b/winaccessibility/Module_winaccessibility.mk old mode 100755 new mode 100644 diff --git a/winaccessibility/WinResTarget_uacccom.mk b/winaccessibility/WinResTarget_uacccom.mk old mode 100755 new mode 100644 diff --git a/winaccessibility/inc/AccEventListener.hxx b/winaccessibility/inc/AccEventListener.hxx old mode 100755 new mode 100644 diff --git a/winaccessibility/inc/AccObjectWinManager.hxx b/winaccessibility/inc/AccObjectWinManager.hxx old mode 100755 new mode 100644 diff --git a/winaccessibility/source/UAccCOM/AccActionBase.h b/winaccessibility/source/UAccCOM/AccActionBase.h old mode 100755 new mode 100644 diff --git a/winaccessibility/source/UAccCOM/AccComponentBase.h b/winaccessibility/source/UAccCOM/AccComponentBase.h old mode 100755 new mode 100644 diff --git a/winaccessibility/source/UAccCOM/AccRelation.cxx b/winaccessibility/source/UAccCOM/AccRelation.cxx old mode 100755 new mode 100644 diff --git a/winaccessibility/source/UAccCOM/AccTextBase.cxx b/winaccessibility/source/UAccCOM/AccTextBase.cxx old mode 100755 new mode 100644 diff --git a/winaccessibility/source/UAccCOM/AccTextBase.h b/winaccessibility/source/UAccCOM/AccTextBase.h old mode 100755 new mode 100644 diff --git a/winaccessibility/source/UAccCOM/EnumVariant.h b/winaccessibility/source/UAccCOM/EnumVariant.h old mode 100755 new mode 100644 diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx b/winaccessibility/source/UAccCOM/MAccessible.cxx old mode 100755 new mode 100644 diff --git a/winaccessibility/source/UAccCOM/Resource.h b/winaccessibility/source/UAccCOM/Resource.h old mode 100755 new mode 100644 diff --git a/winaccessibility/source/UAccCOM/UAccCOM.cxx b/winaccessibility/source/UAccCOM/UAccCOM.cxx old mode 100755 new mode 100644 diff --git a/winaccessibility/source/UAccCOM/UNOXWrapper.h b/winaccessibility/source/UAccCOM/UNOXWrapper.h old mode 100755 new mode 100644 diff --git a/winaccessibility/source/service/AccEventListener.cxx b/winaccessibility/source/service/AccEventListener.cxx old mode 100755 new mode 100644 diff --git a/winaccessibility/source/service/AccFrameEventListener.cxx b/winaccessibility/source/service/AccFrameEventListener.cxx old mode 100755 new mode 100644 diff --git a/winaccessibility/source/service/AccObjectWinManager.cxx b/winaccessibility/source/service/AccObjectWinManager.cxx old mode 100755 new mode 100644 diff --git a/winaccessibility/source/service/AccTopWindowListener.cxx b/winaccessibility/source/service/AccTopWindowListener.cxx old mode 100755 new mode 100644 diff --git a/winaccessibility/source/service/checkmt.cxx b/winaccessibility/source/service/checkmt.cxx old mode 100755 new mode 100644 diff --git a/winaccessibility/source/service/checkmt.hxx b/winaccessibility/source/service/checkmt.hxx old mode 100755 new mode 100644 diff --git a/winaccessibility/source/service/msaaservice_impl.cxx b/winaccessibility/source/service/msaaservice_impl.cxx old mode 100755 new mode 100644 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Building LibreOffice from an IDE
Hi, so I just pushed: https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=ba99e296077e6bc6d6a153d01a45bd9ebe1a1d35 to master. As it says, this allows building LibreOffice conveniently from an IDE -- kdevelop in this case -- with most of the usual features: - autocompletion - building a module from the IDE - building all of LibreOffice from the IDE - nondebug and debug build configs for the above - starting LibreOffice from the IDE - running unitchecks, slowchecks and subsequentchecks from the IDE It doesnt yet allow debugging from the IDE, but I guess it wouldnt be too hard to add. a few canveats: - autocompletion works, but: * you should have a full build before starting with this as otherwise generated headers (that is all of UNO) is missing * for high level modules, parsing all of the header takes a _lot_ of time, once that is done though, it seems to be working rather snappy - our toplevel Makefile.in with all its you tell me to do foo, but I rather do bar-wrapping logic, does not handle make unitcheck slowcheck subsequentcheck correctly, but that needs fixing there. - building objects for different libraries and targets (with different defines and include paths) from one directory isnt something that kdevelop handles well, but I dont yet know if that is of realpractical relevance for the autocomplete. This is a historic abomination anyway and should be killed with fire, see: https://bugs.freedesktop.org/show_bug.cgi?id=70422 If you want to try it out, do: make kdevelop-ide-integration and open one of the *.kdev4 projects with kdevelop. Note that the kdevelop specific part of this is a mere ~150 lines of Python (half of that config templates), so this is a call to arms too: You prefer Eclipse, Netbeans, MS Visual Studio, $YOURIDE? Well, then add the same for those IDEs! ;) https://bugs.freedesktop.org/show_bug.cgi?id=70414 TBH I did this mostly to prove a point on how easy it is to get this IDE stuff out of gbuild, not because I crave to develop LibreOffice in a IDE. OTOH, now that I see the potential there ... Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 70414] create VSProject files for code editing in MSVS from gbuild
https://bugs.freedesktop.org/show_bug.cgi?id=70414 --- Comment #2 from Michael Meeks michael.me...@collabora.com --- Wow Bjoern; you're awesome =) hopefully MSVS / Eclipse are not -so- far away from KDevelop (conceptually ;-) In the star-treck future I guess that could even become some generally useful tool for operating on the (harder and more awful ;-) autotoolsized projects too (?) Exciting ! -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Building LibreOffice from an IDE
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Real good news... indeed. Thanks you so much for that, Bjoern. I was already using kdevelop for editing, type checking and autocompletion. Very handy. But lack of time, kdevelop crashes and heavy page swaps prevented me to full use of it. Eager to test... How about git/gerrit? Cheers Olivier Em 19-11-2013 10:08, bjoern escreveu: Hi, so I just pushed: https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=ba99e296077e6bc6d6a153d01a45bd9ebe1a1d35 to master. As it says, this allows building LibreOffice conveniently from an IDE -- kdevelop in this case -- with most of the usual features: - autocompletion - building a module from the IDE - building all of LibreOffice from the IDE - nondebug and debug build configs for the above - starting LibreOffice from the IDE - running unitchecks, slowchecks and subsequentchecks from the IDE It doesnt yet allow debugging from the IDE, but I guess it wouldnt be too hard to add. a few canveats: - autocompletion works, but: * you should have a full build before starting with this as otherwise generated headers (that is all of UNO) is missing * for high level modules, parsing all of the header takes a _lot_ of time, once that is done though, it seems to be working rather snappy - our toplevel Makefile.in with all its you tell me to do foo, but I rather do bar-wrapping logic, does not handle make unitcheck slowcheck subsequentcheck correctly, but that needs fixing there. - building objects for different libraries and targets (with different defines and include paths) from one directory isnt something that kdevelop handles well, but I dont yet know if that is of realpractical relevance for the autocomplete. This is a historic abomination anyway and should be killed with fire, see: https://bugs.freedesktop.org/show_bug.cgi?id=70422 If you want to try it out, do: make kdevelop-ide-integration and open one of the *.kdev4 projects with kdevelop. Note that the kdevelop specific part of this is a mere ~150 lines of Python (half of that config templates), so this is a call to arms too: You prefer Eclipse, Netbeans, MS Visual Studio, $YOURIDE? Well, then add the same for those IDEs! ;) https://bugs.freedesktop.org/show_bug.cgi?id=70414 TBH I did this mostly to prove a point on how easy it is to get this IDE stuff out of gbuild, not because I crave to develop LibreOffice in a IDE. OTOH, now that I see the potential there ... Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice - -- Olivier Hallot Founder, Board of Directors Member - The Document Foundation The Document Foundation, Kurfürstendamm 188, 10707 - Berlin, Germany Gemeinnützige rechtsfähige Stiftung des bürgerlichen Rechts Legal details: http://www.documentfoundation.org/imprint LibreOffice translation leader for Brazilian Portuguese +55-21-8822-8812 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBAgAGBQJSi1rEAAoJEJp3R7nH3vLx85gH/3FBWOMtFKThDku8w/D5iXct qGbj9XVwHdaiUnMgOBuGGU9IznYIorvMFr/3OKC0CwZ0cwKltuofr/EboBO8z8sC hjvdT/QpxHzvuJ1KLgfS3nNolqLr8Hsnkpqte54qnpBjfWRXevo/Yb8qVjSm/lx+ k/IenCJzAJxZVijOigJFf2ppyLqo08sqxk7kywEqVFkg/i7GdtZb/VhRKqiz3Usf WWgKN3J7Ym1TDpLTsei+kplTYvkhwehtg0br2iknsjjseJvORsayqt3cJk085Pw4 NIsOW6MFTokwUyF/QEaf6DomcUqf3frHgN2qbkhBcJ1fEyfLWSuW2Jt69k6WBwk= =App3 -END PGP SIGNATURE- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 70414] create VSProject files for code editing in MSVS from gbuild
https://bugs.freedesktop.org/show_bug.cgi?id=70414 --- Comment #3 from Björn Michaelsen bjoern.michael...@canonical.com --- Well, I guess Eclipse/MSVS would likely be a bit more verbose as they are using this enterprisy newfangled XML. But I dont think it would be much _harder_ per se. As for extending this to autotoolsy projects Im not sure if that is so easy. It it really trivial to extract the build information from gbuild as it is exportable in a really easy to parse way, while autotools defies parsing even by most humans judging from a nonscientific survey in my environment(*). ;) (*) It might work though if the project restricts itself to a welldefined subset of autotools (just like gbuild essentially restricts GNU make to a DSL for target definition). -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] libcdr.git: src/lib
src/lib/CDRDocument.cpp | 29 + 1 file changed, 17 insertions(+), 12 deletions(-) New commits: commit c90e4c9587917bbe3c28597f6b7392f86a5ed71d Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Tue Nov 19 13:34:46 2013 +0100 Use the right streams in right places Change-Id: I204d422d3645d4527044bb3d1750ad6ab625fc02 diff --git a/src/lib/CDRDocument.cpp b/src/lib/CDRDocument.cpp index 6760a78..aad658c 100644 --- a/src/lib/CDRDocument.cpp +++ b/src/lib/CDRDocument.cpp @@ -88,12 +88,13 @@ bool libcdr::CDRDocument::isSupported(librevenge::RVNGInputStream *input) unsigned version = getCDRVersion(input); if (version) return true; -if (input-isStructured()) +if (tmpInput-isStructured()) { - input = input-getSubStreamByName(content/riffData.cdr); + input = tmpInput-getSubStreamByName(content/riffData.cdr); if (!input) -input = input-getSubStreamByName(content/root.dat); +input = tmpInput-getSubStreamByName(content/root.dat); } +tmpInput-seek(0, librevenge::RVNG_SEEK_SET); if (!input) return false; input-seek(0, librevenge::RVNG_SEEK_SET); @@ -164,17 +165,18 @@ bool libcdr::CDRDocument::parse(librevenge::RVNGInputStream *input, librevenge:: std::vectorlibrevenge::RVNGInputStream * dataStreams; try { -bool isZipDocument = input-isStructured(); std::vectorstd::string dataFiles; -if (isZipDocument) +if (tmpInput-isStructured()) { - input = input-getSubStreamByName(content/riffData.cdr); + tmpInput-seek(0, librevenge::RVNG_SEEK_SET); + input = tmpInput-getSubStreamByName(content/riffData.cdr); if (!input) { -input = input-getSubStreamByName(content/root.dat); +tmpInput-seek(0, librevenge::RVNG_SEEK_SET); +input = tmpInput-getSubStreamByName(content/root.dat); if (input) { - boost::scoped_ptrlibrevenge::RVNGInputStream tmpStream(input-getSubStreamByName(content/dataFileList.dat)); + boost::scoped_ptrlibrevenge::RVNGInputStream tmpStream(tmpInput-getSubStreamByName(content/dataFileList.dat)); if (bool(tmpStream)) { std::string dataFileName; @@ -201,21 +203,23 @@ bool libcdr::CDRDocument::parse(librevenge::RVNGInputStream *input, librevenge:: std::string streamName(content/data/); streamName += dataFiles[i]; CDR_DEBUG_MSG((Extracting stream: %s\n, streamName.c_str())); - dataStreams.push_back(input-getSubStreamByName(streamName.c_str())); + tmpInput-seek(0, librevenge::RVNG_SEEK_SET); + dataStreams.push_back(tmpInput-getSubStreamByName(streamName.c_str())); } if (!input) input = tmpInput; -input-seek(0, librevenge::RVNG_SEEK_SET); CDRParserState ps; // libcdr extension to the getSubStreamByName. Will extract the first stream in the // given directory -librevenge::RVNGInputStream *cmykProfile = input-getSubStreamByName(color/profiles/cmyk/); +tmpInput-seek(0, librevenge::RVNG_SEEK_SET); +librevenge::RVNGInputStream *cmykProfile = tmpInput-getSubStreamByName(color/profiles/cmyk/); if (cmykProfile) { ps.setColorTransform(cmykProfile); delete cmykProfile; } -librevenge::RVNGInputStream *rgbProfile = input-getSubStreamByName(color/profiles/rgb/); +tmpInput-seek(0, librevenge::RVNG_SEEK_SET); +librevenge::RVNGInputStream *rgbProfile = tmpInput-getSubStreamByName(color/profiles/rgb/); if (rgbProfile) { ps.setColorTransform(rgbProfile); @@ -223,6 +227,7 @@ bool libcdr::CDRDocument::parse(librevenge::RVNGInputStream *input, librevenge:: } CDRStylesCollector stylesCollector(ps); CDRParser stylesParser(dataStreams, stylesCollector); +input-seek(0, librevenge::RVNG_SEEK_SET); retVal = stylesParser.parseRecords(input); if (ps.m_pages.empty()) retVal = false; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/ucalc_formula.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit a685c85d71e7378b62837be3f401f355f214c3b1 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Tue Nov 19 07:33:22 2013 -0500 Temporarily disable this code to let the linker not fail on Windows. Change-Id: Iafd5a91803b97efe78ff5d864865125973535f51 diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx index 6db441c..b107165 100644 --- a/sc/qa/unit/ucalc_formula.cxx +++ b/sc/qa/unit/ucalc_formula.cxx @@ -33,6 +33,7 @@ using namespace formula; void Test::testFormulaCreateStringFromTokens() { +#if 0 // Insert sheets. OUString aTabName1(Test); OUString aTabName2(Kevin's Data); @@ -148,6 +149,7 @@ void Test::testFormulaCreateStringFromTokens() m_pDoc-DeleteTab(2); m_pDoc-DeleteTab(1); m_pDoc-DeleteTab(0); +#endif } namespace { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: RepositoryModule_host.mk
RepositoryModule_host.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 076342caf8419432a17bf2300d2c7d6c033386f1 Author: Michael Stahl mst...@redhat.com Date: Tue Nov 19 13:38:58 2013 +0100 RepositoryModule: conditionally add winaccessibility Change-Id: I5f72d01ea96835607f93328528051651866354d9 diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index f85fe43..91141f1 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -142,6 +142,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ uui \ vbahelper \ vcl \ + $(if $(ENABLE_IA2),winaccessibility) \ wizards \ writerfilter \ writerperfect \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libcdr.git: src/lib
src/lib/CDRParser.cpp |2 ++ 1 file changed, 2 insertions(+) New commits: commit be72b4f99fabd5ca109d2b64c0e3155f0f45410b Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Tue Nov 19 13:46:46 2013 +0100 Don't parse arrows for versions = 5 Change-Id: I90684d9c731d6daee25e18bedbbb0ee951327671 diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp index 7d5c6a7..f73e54f 100644 --- a/src/lib/CDRParser.cpp +++ b/src/lib/CDRParser.cpp @@ -1489,6 +1489,8 @@ void libcdr::CDRParser::readPath(librevenge::RVNGInputStream *input) void libcdr::CDRParser::readArrw(librevenge::RVNGInputStream *input, unsigned length) { CDR_DEBUG_MSG((CDRParser::readArrw\n)); + if (m_version 600) +return; if (!_redirectX6Chunk(input, length)) throw GenericException(); unsigned arrowId = readU32(input); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Building LibreOffice from an IDE
Hi, On Tue, Nov 19, 2013 at 10:34:15AM -0200, Olivier Hallot wrote: But lack of time, kdevelop crashes and heavy page swaps prevented me to full use of it. Well, generating the project files doesnt make the fact that LibreOffice is a big beast magically disappear unfortunately(*). Eager to test... How about git/gerrit? Well, this enables the kdevelop git plugin, so yeah -- you also get a version control UI in kdevelop with this: http://cgit.freedesktop.org/libreoffice/core/tree/bin/gbuild-to-ide?ba99e296077e6bc6d6a153d01a45bd9ebe1a1d35#n238 Best, Bjoern (*) LibreOffice: based on technology breaking your toolchain since 1985! ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 70414] create VSProject files for code editing in MSVS from gbuild
https://bugs.freedesktop.org/show_bug.cgi?id=70414 --- Comment #4 from Michael Meeks michael.me...@collabora.com --- As for extending this to autotoolsy projects Im not sure if that is so easy. It it really trivial to extract the build information from gbuild as it is exportable in a really easy to parse way, while autotools defies parsing even by most humans judging from a nonscientific survey in my environment Heh - sure, I was thinking of parsing the generated gnumake rules and deps etc. from running a similar (but plunging) 'make -n -p' on an autotools project; all previous attempts I've seen to parse auto* ended in dismal failure ;-) but extending this approach would work nicely I think. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 70414] create VSProject files for code editing in MSVS from gbuild
https://bugs.freedesktop.org/show_bug.cgi?id=70414 --- Comment #5 from Björn Michaelsen bjoern.michael...@canonical.com --- (In reply to comment #4) Heh - sure, I was thinking of parsing the generated gnumake rules and deps etc. from running a similar (but plunging) 'make -n -p' on an autotools project; all previous attempts I've seen to parse auto* ended in dismal failure ;-) but extending this approach would work nicely I think. Possible maybe. But since autotools uses a lot of recursive make, one would need to walk the dirs and then make sense of it by merging the pieces into one big view of the thing adding context here and there. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Joel Madero jmadero@gmail.com changed: What|Removed |Added Depends on||71749 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 --- Comment #115 from Joel Madero jmadero@gmail.com --- Nominated bug 71749 - writer hangs if you open a doc with a table in the footer. This is a recent regression (4.1), the bug has been bibisected. Thanks all -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Build switches for mysql connector extension - Mac OSX
Hi all, I used to be able to build a functional mysql connector on MacOSX by using the build switch : --enable-ext-mariadb-connector However, the inclusion of a build-time downloaded libmariadb library was stopped after this caused crashes on Window If you run the above switch now on OSX, you get the following message : libmariadb is known to be broken as of 2013-10; use libmysqlclient and configure stops without completing. So the million dollar question now is : which switch is to be used now ? On my Linux systems, I don't seem to have any problem building the connector extension, I imagine because libmysqlclient is included on the machines in question (because I'm running mysql client and server), along with libmysqlcppconn. However, on Mac OSX, these are not included by default. I have downloaded the MySQL C connector library source, and also have a copy of libmysqlcppconn for OSX, but how do I tell autogen.sh to use them ? I have tried using : --with-system-mysql-cppconn=/path/to/lib/ and removing the --enable-ext-mariadb-connector but if I do this, the connector fails to get built. I see a mysql connector directory in the extensions directory, but it doesn't contain any of the libs and isn't assembled into an OXT, unlike say, NLPSolver. I suspect this is due to the externalisation of these extensions. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: junit autogen error?
Thanks for the suggestion Noel. I tried that and got a similar message: $ ./autogen.sh --with-junit=/opt/local/share/java/junit-4.11.jar checking for JUnit 4... configure: error: your junit jar neither sets a classpath nor includes hamcrest; please provide a full junit jar or use --without-junit Error running configure at ./autogen.sh line 209. I should mention that I also tried to set the classpath environment variable and got the same result. On Nov 15, 2013, at 7:48 AM, Noel Grandin n...@peralex.com wrote: On 2013-11-13 04:14, Joseph Pellegrino wrote: When I specify the junit path: ./autogen.sh --with-junit=/opt/local/share/java/ You need to do: ./autogen.sh --with-junit=/opt/local/share/java/junit-4.jar or whatever your jar file name is. Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Vendors Name via UNO API / Basic Macros
On 18/11/2013 18:32, Lionel Elie Mamane wrote: On Mon, Nov 18, 2013 at 06:10:34PM +0100, Fernand Vanrie wrote: On 18/11/2013 18:02, Lionel Elie Mamane wrote: On Fri, Nov 15, 2013 at 03:43:10PM +0100, Thomas Krumbein wrote: Am 15.11.2013 15:35, schrieb Jan Holesovsky: Thomas Krumbein pÃÅ¡e v Pá 15. 11. 2013 v 13:43 +0100: Well, this change was a small technical thing - but with a very big influence on typical market applications. Every custom macro application with dialogs or forms for user interfaces is influenced if dialogs/forms using Date/time fields. Have you filed a bugreport, please? A minimal example of the macro that fails would be most appreciated. Well - it´s not a bug, because you mentioned the change in release-notes of version 4.1. What´s happend, you can read my article on my homepage. It is in german language but I am sure, you get the context ;) http://www.mic-consulting.de/index.php/opersource/api-makros-libo-aoo/10-datumsfelder-geaendert-in-lo-4-1-1 I took a look; since ... 4.1.2? 4.1.3? not sure anymore, you can also use: CDateFromUnoDate to replace CDateFromIso yep conversions are not the problem, its the exiting code who is broken in many places ? What exiting code? sorry: existing code like in my private macro's and some extentions who uses the date property comming from a date control ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] 4.0.6.2 build errors
Hi All, I am building LO 4.0.6.2 and there are some errors. I know that 4.0 is EOL. I think 4.1 and 4.2 are affected too. 1 When I build version only en-US, autotextshare_en-us.zip is formed and is located in the solver/wntmsci12.pro/pck, but when I build with --with-lang = pl de option, then thisfile isn't created, only the files in pland de version, because of this an error occurres during the buildingof the installation file.msi. Is this a known bug? As I remember en-US is always build, because this is native language, and I don't need to use --with-lang en-US pl de. Thus I think, there is a bug. 2 There is an errorin archive http://dev-www.libreoffice.org/src/libvisio-0.0.31.tar.bz2 (downloaded after the command make fetch) in / build/win32/libvisio.vcproj, is missing. I attach the patch. Because of this the LO doesn't build. Strange that no one has reportedthis error, and ithas not been corrected, when everybody who built the LO had to encounter this;-) This also probably applies to 4.1, 4.2 . In the version libvisio-0.0.30.tar.bz2 everything was ok. 3 There is a bug in / solenv / bin / modules / installer / windows file msiglobal.pm. my $ comment = $ allvariableshashref- {'PRODUCTNAME'}; returns the name without the quotation marks, If the product name is one word (like LibreOffice) that is not a problem, but as in my custom build name has two parts and there is a space between, which results in erroneous launch of msiinfo.exe with parameters. I attach the patch. All the best, Jakub Kościelak libvisio.vcproj.patch *** ./a/libvisio.vcproj 2013-08-28 09:50:52.0 +0200 --- ./b/libvisio.vcproj 2013-11-13 19:40:14.379125000 +0100 *** *** 871,876 --- 871,877 /File File RelativePath=..\..\src\lib\VSDXTheme.h + /File File RelativePath=..\..\src\lib\VSDZipStream.h msibuild.pm.patch *** ./a/msiglobal.pm2013-10-12 01:22:28.211661200 +0200 --- ./b/msiglobal.pm2013-11-16 13:21:41.555071700 +0100 *** *** 597,602 --- 597,616 return $subject; } + # + # Returning the comment for the Summary Information Stream + # + + sub get_comment_for_sis + { + my ( $allvariableshashref ) = @_; + + my $comment = $allvariableshashref-{'PRODUCTNAME'}; + + $comment = \ . $comment . \; + + return $comment; + } ## # Returning the security for the Summary Information Stream ## *** *** 635,641 my $title = \Installation database\; my $author = get_author_for_sis(); my $subject = get_subject_for_sis($allvariableshashref); ! my $comment = $allvariableshashref-{'PRODUCTNAME'}; my $keywords = \Install,MSI\; my $appname = \Windows Installer\; my $security = get_security_for_sis(); --- 649,655 my $title = \Installation database\; my $author = get_author_for_sis(); my $subject = get_subject_for_sis($allvariableshashref); ! my $comment = get_comment_for_sis($allvariableshashref); my $keywords = \Install,MSI\; my $appname = \Windows Installer\; my $security = get_security_for_sis(); *** ./a/libvisio.vcproj 2013-08-28 09:50:52.0 +0200 --- ./b/libvisio.vcproj 2013-11-13 19:40:14.379125000 +0100 *** *** 871,876 --- 871,877 /File File RelativePath=..\..\src\lib\VSDXTheme.h + /File File RelativePath=..\..\src\lib\VSDZipStream.h *** ./a/msiglobal.pm 2013-10-12 01:22:28.211661200 +0200 --- ./b/msiglobal.pm 2013-11-16 13:21:41.555071700 +0100 *** *** 597,602 --- 597,616 return $subject; } + # + # Returning the comment for the Summary Information Stream + # + + sub get_comment_for_sis + { + my ( $allvariableshashref ) = @_; + + my $comment = $allvariableshashref-{'PRODUCTNAME'}; + + $comment = \ . $comment . \; + + return $comment; + } ## # Returning the security for the Summary Information Stream ## *** *** 635,641 my $title = \Installation database\; my $author = get_author_for_sis(); my $subject = get_subject_for_sis($allvariableshashref); ! my $comment = $allvariableshashref-{'PRODUCTNAME'}; my $keywords = \Install,MSI\; my $appname = \Windows
General release organization meeting
Hi all, In order to try to have the best organization for the release of 4.2.0 that will happen in February, I would like to organize a meeting between all the projects concerned to make sure we don't forget anything or miss some deadlines and coordinate well together. It would be good to have this meeting during RC1 period (16 to 22 of December) so we have still some time left before the final release. I've set a Doodle here : http://doodle.com/sqkyaaeb5aaigarq We will use the marketing channel on IRC and it would be really great if we could have people representative from : - design team - marketing team - QA team - localization team - native language team and members who administrate website in their language - developer team - documentation team, I'm not sure this team is really concerned but feel free to join :) If I miss somebody don't hesitate to tell me :) And please follow up the discussion on the *marketing list*. I will provide an agenda of the meeting on the wiki next week, where you'll be able to add the points you want us to discuss. I would like to keep it short for all teams and we will do another meeting if one team feels it's necessary. Thanks all in advance for your participation! Kind regards Sophie ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: junit autogen error?
On Tue Nov 19 00:11:49 PST 2013 Stephan Bergmann wrote: The best fix probably is to use javac with -classpath junit.jar for the check. You can use javap to check the existence of java classes in a JAR: $javap -classpath /Users/davido/Downloads/junit4.11/junit-4.11.jar org.hamcrest.Matcher /dev/null $echo $? $javap -classpath /Users/davido/Downloads/junit4.11/junit-4.11.jar org.hamcrest.Matcher2 /dev/null $echo $? 1 David ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - embedserv/source
embedserv/source/embed/docholder.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 53edaf552528981e54f7bc567d88421c4741ed17 Author: Andras Timar andras.ti...@collabora.com Date: Tue Nov 19 12:40:38 2013 +0100 fdo#66232 fix opening files via COM server Thanks to Noel Grandin Stephan Bergmann for the hint on IRC. Change-Id: I2b407a53b02a7ecdbff553ad47674c1e00455180 Reviewed-on: https://gerrit.libreoffice.org/6721 Reviewed-by: Stephan Bergmann sberg...@redhat.com Tested-by: Stephan Bergmann sberg...@redhat.com diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx index 488451e..af0add9 100644 --- a/embedserv/source/embed/docholder.cxx +++ b/embedserv/source/embed/docholder.cxx @@ -354,7 +354,7 @@ HRESULT DocumentHolder::InPlaceActivate( m_xFrame-registerDispatchProviderInterceptor( CreateNewInterceptor() ); -m_xLayoutManager.set( m_xFrame-getLayoutManager(), uno::UNO_QUERY_THROW ); +m_xLayoutManager.set( m_xFrame-getLayoutManager(), uno::UNO_QUERY ); if(m_xLayoutManager.is()) m_xLayoutManager-setDockingAreaAcceptor(this); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 7 commits - 11/dde52476f5723d874699e0f0fc58092e7e96ad 48/46822317ef5b262b6ff0e12780232fe56628f3 82/95309925d511f36b0705ed2678a72f31282226
11/dde52476f5723d874699e0f0fc58092e7e96ad |1 + 48/46822317ef5b262b6ff0e12780232fe56628f3 |1 + 82/95309925d511f36b0705ed2678a72f31282226 |1 + a7/bc1f5a489cc599919e4f0cad5e9e72fb3a7506 |1 + be/646a0b763e1688fbd4bc6cee0d3df79b90820b |1 + c2/afeb1c3f11e8f420b59f3786eb8626c99ff595 |1 + c6/7138fd294f0b32dd14c3e3c84fccf81e94b0e3 |1 + 7 files changed, 7 insertions(+) New commits: commit fe6f46b662c43f538c2adb871911d3b9be7f4998 Author: Caolán McNamara caol...@redhat.com Date: Tue Nov 19 15:57:10 2013 + Notes added by 'git notes add' diff --git a/48/46822317ef5b262b6ff0e12780232fe56628f3 b/48/46822317ef5b262b6ff0e12780232fe56628f3 new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/48/46822317ef5b262b6ff0e12780232fe56628f3 @@ -0,0 +1 @@ +ignore: obsolete commit da17b185f84c14df72e2d33d6597ed8806a963ad Author: Caolán McNamara caol...@redhat.com Date: Tue Nov 19 15:54:57 2013 + Notes added by 'git notes add' diff --git a/11/dde52476f5723d874699e0f0fc58092e7e96ad b/11/dde52476f5723d874699e0f0fc58092e7e96ad new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/11/dde52476f5723d874699e0f0fc58092e7e96ad @@ -0,0 +1 @@ +ignore: obsolete commit 29337e9f0fd2306387ef916ca9aa139a5de3c2ce Author: Caolán McNamara caol...@redhat.com Date: Tue Nov 19 15:53:09 2013 + Notes added by 'git notes add' diff --git a/82/95309925d511f36b0705ed2678a72f31282226 b/82/95309925d511f36b0705ed2678a72f31282226 new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/82/95309925d511f36b0705ed2678a72f31282226 @@ -0,0 +1 @@ +ignore: obsolete commit a22016f3b1f77035cc4d20fbdb97c9b8aca3d571 Author: Caolán McNamara caol...@redhat.com Date: Tue Nov 19 15:53:00 2013 + Notes added by 'git notes add' diff --git a/c6/7138fd294f0b32dd14c3e3c84fccf81e94b0e3 b/c6/7138fd294f0b32dd14c3e3c84fccf81e94b0e3 new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/c6/7138fd294f0b32dd14c3e3c84fccf81e94b0e3 @@ -0,0 +1 @@ +ignore: obsolete commit 1bc489da050d5fb89d51bd03669551b861a3b21e Author: Caolán McNamara caol...@redhat.com Date: Tue Nov 19 15:52:48 2013 + Notes added by 'git notes add' diff --git a/a7/bc1f5a489cc599919e4f0cad5e9e72fb3a7506 b/a7/bc1f5a489cc599919e4f0cad5e9e72fb3a7506 new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/a7/bc1f5a489cc599919e4f0cad5e9e72fb3a7506 @@ -0,0 +1 @@ +ignore: obsolete commit 043a143443d95b64582ed2dc118e387921b32f50 Author: Caolán McNamara caol...@redhat.com Date: Tue Nov 19 15:52:32 2013 + Notes added by 'git notes add' diff --git a/be/646a0b763e1688fbd4bc6cee0d3df79b90820b b/be/646a0b763e1688fbd4bc6cee0d3df79b90820b new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/be/646a0b763e1688fbd4bc6cee0d3df79b90820b @@ -0,0 +1 @@ +ignore: aoo commit 27132c4554ceddd6edcfc86c892e960f77086893 Author: Caolán McNamara caol...@redhat.com Date: Tue Nov 19 15:52:18 2013 + Notes added by 'git notes add' diff --git a/c2/afeb1c3f11e8f420b59f3786eb8626c99ff595 b/c2/afeb1c3f11e8f420b59f3786eb8626c99ff595 new file mode 100644 index 000..98b4d96 --- /dev/null +++ b/c2/afeb1c3f11e8f420b59f3786eb8626c99ff595 @@ -0,0 +1 @@ +merged as: c2b5521921b806ff7b04cdacebde3834d2aafd4b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - set_soenv.in solenv/gbuild solenv/inc stlport/systemstlguards winaccessibility/source
set_soenv.in|5 - solenv/gbuild/platform/macosx.mk|2 solenv/inc/unxmacx.mk |1 stlport/systemstlguards/postextstl.h| 32 stlport/systemstlguards/preextstl.h | 73 winaccessibility/source/UAccCOM/makefile.mk | 15 +++-- 6 files changed, 116 insertions(+), 12 deletions(-) New commits: commit 4846822317ef5b262b6ff0e12780232fe56628f3 Author: Herbert Dürr h...@apache.org Date: Tue Nov 19 13:45:13 2013 + #i107914# fix winaccessibility build when --disable-atl configure switch is used Notes: ignore: obsolete diff --git a/winaccessibility/source/UAccCOM/makefile.mk b/winaccessibility/source/UAccCOM/makefile.mk index 9222140..5182254 100644 --- a/winaccessibility/source/UAccCOM/makefile.mk +++ b/winaccessibility/source/UAccCOM/makefile.mk @@ -24,14 +24,14 @@ PRJNAME=winaccessibility TARGET=UAccCOM # --- Settings - -.IF $(GUI) == WNT $(DISABLE_ATL)== -PROF_EDITION=TRUE -.ENDIF +.IF $(GUI)!=WNT || $(DISABLE_ATL)!= +all: +@echo $TARGET will not be built because GUI='$(GUI)' and DISABLE_ATL='$(DISABLE_ATL)' +.ELSE +PROF_EDITION=TRUE .INCLUDE : settings.mk -.IF $(GUI) == WNT $(DISABLE_ATL)== - VERSIONOBJ= LIBTARGET=NO USE_DEFFILE=YES @@ -121,8 +121,6 @@ SHL1RES=$(RES)/$(TARGET).res DEF1NAME= $(TARGET) #DEF1EXPORTFILE= exports.dxp -.ENDIF - # --- Targets -- .INCLUDE : target.mk @@ -133,3 +131,6 @@ $(MISC)/$(TARGET).manifest: $(BIN)$/$(TARGET)$(DLLPOST) cat *.rgs $(MISC)$/$(TARGET).rgs mt.exe -rgs:$(MISC)$/$(TARGET).rgs -tlb:$(MISC)$/$(TARGET).tlb -dll:$(TARGET).dll -out:$(MISC)$/$(TARGET).manifest mt.exe -manifest $(MISC)$/$(TARGET).manifest -outputresource:$(BIN)$/$(TARGET)$(DLLPOST)\;\#97 + +.ENDIF # $(GUI)!=WNT || $(DISABLE_ATL)!= + commit 8295309925d511f36b0705ed2678a72f31282226 Author: Herbert Dürr h...@apache.org Date: Tue Nov 19 12:46:12 2013 + #i122362# post-stlport fixes for the macosx-target=10.4 build Notes: ignore: obsolete diff --git a/set_soenv.in b/set_soenv.in index dffde97..1e797ad 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -1444,8 +1444,7 @@ elsif ($platform =~ m/cygwin/) } elsif ($platform =~ m/darwin/) { - my $STLINC .= $I./Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/c++/v1/; - $SOLARINC .= $STLINC . $I.$FRAMEWORKSHOME.$ds.JavaVM.framework.$ds.Headers; + $SOLARINC .= . $I.$FRAMEWORKSHOME.$ds.JavaVM.framework.$ds.Headers; } else { AddWarning( set_soenv, $platform not configured for system dependant include dir ); @@ -1678,7 +1677,7 @@ if ( $platform =~ m/darwin/ ) # unless you want to do runtime checks for 10.5 api, you also want to use the 10.7 sdk # (safer/easier than dealing with the MAC_OS_X_VERSION_MAX_ALLOWED macro) # http://developer.apple.com/technotes/tn2002/tn2064.html -ToFile( MACOSX_DEPLOYMENT_TARGET, 10.7, e ); +ToFile( MACOSX_DEPLOYMENT_TARGET, 10.4, e ); } # diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 5b91705..a0ab8ce 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -300,7 +300,7 @@ gb_Library_TARGETTYPEFLAGS := -dynamiclib -single_module gb_Library_SYSPRE := lib gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_ gb_Library_PLAINEXT := .dylib -gb_Library_RTEXT := $(COMID)$(gb_Library_PLAINEXT) +gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT) gb_Library_OOOEXT := $(gb_Library_PLAINEXT) gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT) diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk index b3cbb40..8169c14 100644 --- a/solenv/inc/unxmacx.mk +++ b/solenv/inc/unxmacx.mk @@ -44,7 +44,6 @@ CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNO_PTHREAD_PRIORITY $(PROCESSOR_DEFI #.EXPORT: MACOSX_DEPLOYMENT_TARGET CDEFS+=-DQUARTZ EXTRA_CDEFS*=-isysroot /Developer/SDKs/MacOSX10.4u.sdk -.ENDIF # Name of library where static data members are initialized # STATICLIBNAME=static$(DLLPOSTFIX) commit c67138fd294f0b32dd14c3e3c84fccf81e94b0e3 Author: Herbert Dürr h...@apache.org Date: Tue Nov 19 08:06:16 2013 + #i122362# re-add accidentially deleted pre-/post-extstl.h with the stlport4 removal they can be eliminated as soon as the source files that include them have been adjusted Notes: ignore: obsolete diff --git a/stlport/systemstlguards/postextstl.h b/stlport/systemstlguards/postextstl.h new file mode 100644 index 000..e123c7b8 --- /dev/null +++ b/stlport/systemstlguards/postextstl.h @@ -0,0 +1,32 @@ +/** + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information +
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/ucalc_formula.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit d646612f99be91e0706e2f32ae8371a4e7019eb8 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Tue Nov 19 12:01:17 2013 -0500 Narrow it down a bit for the next visit. Still no idea what the problem really is (MSVC is pretty silent about it) or how to fix it. Change-Id: I322779046f0adc0b2807a9d46a5c9140839b7ff7 diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx index b107165..29ecd5a 100644 --- a/sc/qa/unit/ucalc_formula.cxx +++ b/sc/qa/unit/ucalc_formula.cxx @@ -33,7 +33,6 @@ using namespace formula; void Test::testFormulaCreateStringFromTokens() { -#if 0 // Insert sheets. OUString aTabName1(Test); OUString aTabName2(Kevin's Data); @@ -138,18 +137,19 @@ void Test::testFormulaCreateStringFromTokens() OUString aFormula = OUString::createFromAscii(aTests[i]); ScCompiler aComp(m_pDoc, aPos); aComp.SetGrammar(FormulaGrammar::GRAM_ENGLISH); +#if 0 // TODO: This call to CompileString() causes the cppunittester to somehow fail on Windows. pArray.reset(aComp.CompileString(aFormula)); CPPUNIT_ASSERT_MESSAGE(Failed to compile formula string., pArray.get()); OUString aCheck = pArray-CreateString(aCxt, aPos); CPPUNIT_ASSERT_EQUAL(aFormula, aCheck); +#endif } m_pDoc-DeleteTab(3); m_pDoc-DeleteTab(2); m_pDoc-DeleteTab(1); m_pDoc-DeleteTab(0); -#endif } namespace { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: footnotes (Replacing one DLL from official build)
Hi Pavel, Pavel Laštovička píše v Pá 15. 11. 2013 v 18:51 +0100: I wouldn't use it - as you can see, anything can go wrong there... But I am more curious why do you need to do an own swlo.dll in the first place? Cannot you just up-stream the functionality you need there? All the best, Kendy sorry I did not get to respond sooner. I am attaching my trivial change. However it took me long to discover what exactly to change. Oh - the usual scenario with debugging ;-) It fixes compatibility problem with footnotes in Microsoft Word (.doc) documents. Fix removes indentation between footnote number and footnote text. But, it means footnotes in all other documents will be displayed incorrectly. I tried to think about some universal solution but I have not come up with any. I'd be most interested to see the document that triggers the wrong behavior - is there any in the bugzilla? Or can you please produce a minimal one? For the behavior that is different in LibreOffice and MSO, if there is no possibility to make both happy, we have the concept of compatibility options; if there is no other way, this will make it, I'm sure :-) An example of a compatibility option: http://cgit.freedesktop.org/libreoffice/core/commit/?id=bdfc6363d66aa079512cc8008996b633f693fed1 Do you think this would help your case? Regards, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/CppunitTest_sw_odfimport.mk sw/CppunitTest_sw_uiwriter.mk sw/CppunitTest_sw_ww8import.mk sw/qa
sw/CppunitTest_sw_odfimport.mk |1 sw/CppunitTest_sw_uiwriter.mk|1 sw/CppunitTest_sw_ww8import.mk |1 sw/qa/extras/inc/swmodeltestbase.hxx | 16 +--- sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 62 +++ 5 files changed, 68 insertions(+), 13 deletions(-) New commits: commit cc27264466c372d83d9a37001919ec73f5c221b3 Author: Miklos Vajna vmik...@collabora.co.uk Date: Tue Nov 19 18:07:28 2013 +0100 CppunitTest_sw_ooxmlexport: speed this up a bit We don't have too much testcases where we assert directly the resulting zipped XML files, but where we did, we actully invoked filter() 5 times, even if 3 times is enough, fix this. That causes the testcase to run in 1m24.754s (previously it was 1m30.278s). Additionally, at one case the XML result is an expected one, having matching testcase and manual results is always good. Change-Id: Ie905002b113bc84f1e517c35f14739f423fd8ea2 diff --git a/sw/CppunitTest_sw_odfimport.mk b/sw/CppunitTest_sw_odfimport.mk index 7bbdab8..a37b438 100644 --- a/sw/CppunitTest_sw_odfimport.mk +++ b/sw/CppunitTest_sw_odfimport.mk @@ -26,6 +26,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_odfimport, \ unotest \ vcl \ tl \ + utl \ $(gb_UWINAPI) \ )) diff --git a/sw/CppunitTest_sw_uiwriter.mk b/sw/CppunitTest_sw_uiwriter.mk index b4c1257..721cbf6 100644 --- a/sw/CppunitTest_sw_uiwriter.mk +++ b/sw/CppunitTest_sw_uiwriter.mk @@ -26,6 +26,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_uiwriter, \ unotest \ vcl \ tl \ + utl \ $(gb_UWINAPI) \ )) diff --git a/sw/CppunitTest_sw_ww8import.mk b/sw/CppunitTest_sw_ww8import.mk index 93acdbf..d2282f5 100644 --- a/sw/CppunitTest_sw_ww8import.mk +++ b/sw/CppunitTest_sw_ww8import.mk @@ -23,6 +23,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_ww8import, \ test \ unotest \ sw \ + utl \ $(gb_UWINAPI) \ )) diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx index 79eb8af..ba64155 100644 --- a/sw/qa/extras/inc/swmodeltestbase.hxx +++ b/sw/qa/extras/inc/swmodeltestbase.hxx @@ -89,7 +89,11 @@ class SwModelTestBase : public test::BootstrapFixture, public unotest::MacrosTes { public: SwModelTestBase(const char* pTestDocumentPath = , const char* pFilter = ) -: mpXmlBuffer(0), mpTestDocumentPath(pTestDocumentPath), mpFilter(pFilter) +: mpXmlBuffer(0), +mpTestDocumentPath(pTestDocumentPath), +mpFilter(pFilter), +m_nStartTime(0), +m_bExported(false) { } @@ -419,12 +423,12 @@ protected: uno::Sequencebeans::PropertyValue aArgs(1); aArgs[0].Name = FilterName; aArgs[0].Value = OUString::createFromAscii(pFilter); -utl::TempFile aTempFile; -aTempFile.EnableKillingFile(); -xStorable-storeToURL(aTempFile.GetURL(), aArgs); +m_aTempFile.EnableKillingFile(); +xStorable-storeToURL(m_aTempFile.GetURL(), aArgs); uno::Referencelang::XComponent xComponent(xStorable, uno::UNO_QUERY); xComponent-dispose(); -mxComponent = loadFromDesktop(aTempFile.GetURL(), com.sun.star.text.TextDocument); +m_bExported = true; +mxComponent = loadFromDesktop(m_aTempFile.GetURL(), com.sun.star.text.TextDocument); if (mpXmlBuffer) { xmlBufferFree(mpXmlBuffer); @@ -478,6 +482,8 @@ protected: void (T::*pMethod)(); }; sal_uInt32 m_nStartTime; +utl::TempFile m_aTempFile; +bool m_bExported; /// Does m_aTempFile already contain something useful? }; /** diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index e624bfb..e59f13e 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -106,12 +106,11 @@ protected: xmlDocPtr Test::parseExport(const OUString rStreamName) { -// Create the zip file. -utl::TempFile aTempFile; -save(Office Open XML Text, aTempFile); +if (!m_bExported) +return 0; // Read the XML stream we're interested in. -uno::Referencepackages::zip::XZipFileAccess2 xNameAccess = packages::zip::ZipFileAccess::createWithURL(comphelper::getComponentContext(m_xSFactory), aTempFile.GetURL()); +uno::Referencepackages::zip::XZipFileAccess2 xNameAccess = packages::zip::ZipFileAccess::createWithURL(comphelper::getComponentContext(m_xSFactory), m_aTempFile.GetURL()); uno::Referenceio::XInputStream xInputStream(xNameAccess-getByName(rStreamName), uno::UNO_QUERY); boost::shared_ptrSvStream pStream(utl::UcbStreamHelper::CreateStream(xInputStream, sal_True)); pStream-Seek(STREAM_SEEK_TO_END); @@ -610,6 +609,8 @@ DECLARE_OOXMLEXPORT_TEST(testCellBtlr, cell-btlr.docx) */ xmlDocPtr pXmlDoc = parseExport(); +if (!pXmlDoc) +
[Libreoffice-commits] core.git: config_host.mk.in configure.ac Makefile.in
Makefile.in | 29 - config_host.mk.in |1 - configure.ac | 11 --- 3 files changed, 8 insertions(+), 33 deletions(-) New commits: commit 4eebd65858655eef3f39e40ecbe74c505f6b4688 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Tue Nov 19 14:25:45 2013 +0100 fix Makefile.in - unify ~all gbuild targets to one gbuild call - kill CHECK_PARALLELISM as we dont respect it consistently anyway - ${MODULE}.subsequentcheck needs no specialcasing now anymore too - should fix e.g. make unitcheck slowcheck subsequentcheck calls Change-Id: I4238d7de599cb9fbaf09f60539d6655b85b87c29 Reviewed-on: https://gerrit.libreoffice.org/6722 Reviewed-by: Michael Stahl mst...@redhat.com Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com Tested-by: Björn Michaelsen bjoern.michael...@canonical.com diff --git a/Makefile.in b/Makefile.in index 443f758..76d4abf 100644 --- a/Makefile.in +++ b/Makefile.in @@ -7,7 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -.PHONY : all bootstrap build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download fetch findunusedcode get-submodules id install install-strip subsequentcheck tags +.PHONY : all bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download fetch findunusedcode get-submodules id install install-strip subsequentcheck tags debugrun help slowcheck translations unitcheck ifeq ($(MAKECMDGOALS),) MAKECMDGOALS:=all @@ -79,12 +79,9 @@ define gbuild_module_rules $(1): bootstrap fetch cd $(SRCDIR)/$(2) $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -$(1).build $(1).check $(1).clean $(1).showdeliverables: +$(1).build $(1).check $(1).clean $(1).showdeliverables $(1).subsequentcheck: cd $(SRCDIR)/$(2) $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) $$(patsubst $(1).%,%,$$@) -$(1).subsequentcheck: - cd $(SRCDIR)/$(2) $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) subsequentcheck - $(1).all: bootstrap fetch $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $(WORKDIR)/Module/$(1) $(if $(CROSS_COMPILING),,$(WORKDIR)/Module/check/$(1) $(WORKDIR)/Module/slowcheck/$(1)) @@ -231,23 +228,22 @@ bootstrap: compilerplugins # # Build # -# Note: if invoked as make check this will also run subsequentcheck! +# Note: this will pipe through all gbuild targets to ... gbuild +# with some translations like build-all for historic reasons # build: bootstrap fetch $(if $(CROSS_COMPILING),cross-toolset) ifneq ($(filter-out WNT MACOSX IOS ANDROID,$(OS)),) mkdir -p $(INSTDIR) install-gdb-printers -a $(INSTDIR) -c endif $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild \ - all $(if $(filter check,$(MAKECMDGOALS)),subsequentcheck) + $(if $(filter build,$(MAKECMDGOALS)),all) \ + $(if $(filter build-nocheck,$(MAKECMDGOALS)),build) \ + $(filter all build-l10n-only build-non-l10n-only debugrun help slowcheck translations unitcheck subsequentcheck,$(MAKECMDGOALS)) ifeq ($(OS),IOS) $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) ios endif -build-nocheck: bootstrap fetch $(if $(CROSS_COMPILING),cross-toolset) - $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild build - -build-l10n-only build-non-l10n-only: bootstrap fetch $(if $(CROSS_COMPILING),cross-toolset) - $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@ +build-nocheck check debugrun help slowcheck translations unitcheck subsequentcheck : build cross-toolset: bootstrap fetch $(GNUMAKE) gb_Side=build -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild build-tools @@ -384,8 +380,6 @@ findunusedcode: findunusedheaders: $(SRCDIR)/bin/find-unusedheaders.pl -# the actual running of subsequentcheck is now done in build target = faster -check: build dump-deps: @$(SRCDIR)/bin/module-deps.pl $(GNUMAKE) $(SRCDIR)/Makefile.gbuild @@ -393,13 +387,6 @@ dump-deps: dump-deps-png: @$(SRCDIR)/bin/module-deps.pl $(GNUMAKE) $(SRCDIR)/Makefile.gbuild | dot -Tpng -o lo.png -subsequentcheck :| $(if $(filter-out subsequentcheck,$(MAKECMDGOALS)),build) - $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@ - -.PHONY : debugrun help slowcheck translations unitcheck -debugrun help slowcheck translations unitcheck : - $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@ - define GbuildToIdeIntegration $(1)-ide-integration: cd $(SRCDIR) (make cmd -npf Makefile.gbuild all || true) | $(SRCDIR)/bin/gbuild-to-ide --ide $(1) diff --git a/config_host.mk.in b/config_host.mk.in index
[Libreoffice-commits] dev-tools.git: gerrit/gerrit_site
gerrit/gerrit_site/etc/gerrit.config |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 09473aea277d9b6b5096df4c569fe45d175dcbe7 Author: Robinson Tryon qu...@runcibility.com Date: Sun Nov 17 00:41:35 2013 -0500 gerrit: bugs.freedesktop.org - bugs.libreoffice.org Bugzilla Migration Change-Id: Iee7fe506002416d02790c113d4d3d737acaa5043 Reviewed-on: https://gerrit.libreoffice.org/6697 Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com Tested-by: Björn Michaelsen bjoern.michael...@canonical.com diff --git a/gerrit/gerrit_site/etc/gerrit.config b/gerrit/gerrit_site/etc/gerrit.config index 1e205bf..86339d1 100644 --- a/gerrit/gerrit_site/etc/gerrit.config +++ b/gerrit/gerrit_site/etc/gerrit.config @@ -38,7 +38,7 @@ [commentlink freedesktop] match = (BUG|Bug|bug|BUGZILLA|Bugzilla|bugzilla|BZ|Bz|bz|TICKET|Ticket|ticket|ISSUE|fdo|FDO):?#?(\\d+) -link = https://bugs.freedesktop.org/show_bug.cgi?id=$2 +link = https://bugs.libreoffice.org/show_bug.cgi?id=$2 [commentlink redhat] match = (rhbz|RHBZ):?#?(\\d+) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: scripts/regression-hotspots.py
scripts/regression-hotspots.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 92d8069822712640c8c638b7e1be8a5d097f45af Author: Robinson Tryon qu...@runcibility.com Date: Sun Nov 17 00:55:06 2013 -0500 regression-hotspots: bugs.freedesktop.org - bugs.libreoffice.org Bugzilla Migration Change-Id: I18fc95ad85635b0932b1bbf57c867e6273669b02 Reviewed-on: https://gerrit.libreoffice.org/6700 Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com Tested-by: Björn Michaelsen bjoern.michael...@canonical.com diff --git a/scripts/regression-hotspots.py b/scripts/regression-hotspots.py index afb22fc..7431b0a 100755 --- a/scripts/regression-hotspots.py +++ b/scripts/regression-hotspots.py @@ -14,7 +14,7 @@ from urllib.request import urlopen, URLError from io import BytesIO def get_fixed_regression_bugs(): -url = 'https://bugs.freedesktop.org/buglist.cgi?bug_status=UNCONFIRMEDbug_status=NEWbug_status=ASSIGNEDbug_status=REOPENEDbug_status=RESOLVEDbug_status=VERIFIEDbug_status=CLOSEDbug_status=NEEDINFObug_status=PLEASETESTcolumnlist=keywords=regression%2C%20keywords_type=allwordslimit=0list_id=354018product=LibreOfficequery_format=advancedresolution=FIXEDctype=csvhuman=0' +url = 'https://bugs.libreoffice.org/buglist.cgi?bug_status=UNCONFIRMEDbug_status=NEWbug_status=ASSIGNEDbug_status=REOPENEDbug_status=RESOLVEDbug_status=VERIFIEDbug_status=CLOSEDbug_status=NEEDINFObug_status=PLEASETESTcolumnlist=keywords=regression%2C%20keywords_type=allwordslimit=0list_id=354018product=LibreOfficequery_format=advancedresolution=FIXEDctype=csvhuman=0' try: resp = urlopen(url) except URLError: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: scripts/bugcommenters-by-target.py
scripts/bugcommenters-by-target.py |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 7627fe1fd0563a63d816669f4c33053698bba897 Author: Robinson Tryon qu...@runcibility.com Date: Sun Nov 17 00:44:51 2013 -0500 BugCommenters: bugs.freedesktop.org - bugs.libreoffice.org Bugzilla Migration Change-Id: Ib92858fd5c98eedce8ec27038dd526bfc8bc8172 Reviewed-on: https://gerrit.libreoffice.org/6698 Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com Tested-by: Björn Michaelsen bjoern.michael...@canonical.com diff --git a/scripts/bugcommenters-by-target.py b/scripts/bugcommenters-by-target.py index 11aaa88..f03b38e 100755 --- a/scripts/bugcommenters-by-target.py +++ b/scripts/bugcommenters-by-target.py @@ -13,7 +13,7 @@ from urllib.request import urlopen, URLError from io import BytesIO def get_bugs_for_target(target): -url = 'https://bugs.freedesktop.org/buglist.cgi?bug_status=UNCONFIRMEDbug_status=NEWbug_status=ASSIGNEDbug_status=REOPENEDbug_status=RESOLVEDbug_status=VERIFIEDbug_status=CLOSEDbug_status=NEEDINFObug_status=PLEASETESTcolumnlist=list_id=351988product=LibreOfficequery_format=advancedresolution=FIXEDstatus_whiteboard=target%%3A%sstatus_whiteboard_type=allwordsctype=csv' % target +url = 'https://bugs.libreoffice.org/buglist.cgi?bug_status=UNCONFIRMEDbug_status=NEWbug_status=ASSIGNEDbug_status=REOPENEDbug_status=RESOLVEDbug_status=VERIFIEDbug_status=CLOSEDbug_status=NEEDINFObug_status=PLEASETESTcolumnlist=list_id=351988product=LibreOfficequery_format=advancedresolution=FIXEDstatus_whiteboard=target%%3A%sstatus_whiteboard_type=allwordsctype=csv' % target try: resp = urlopen(url) except URLError: @@ -27,7 +27,7 @@ def get_bugs_for_target(target): def get_bug_xml(bug_id): xml='' try: -url = 'https://bugs.freedesktop.org/show_bug.cgi?ctype=xmlid=%d' % bug_id +url = 'https://bugs.libreoffice.org/show_bug.cgi?ctype=xmlid=%d' % bug_id resp = urlopen(url) except URLError: sys.stderr.write('Error fetching {}'.format(url)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Building LibreOffice from an IDE
On Tue, Nov 19, 2013 at 01:08:08PM +0100, bjoern wrote: - our toplevel Makefile.in with all its you tell me to do foo, but I rather do bar-wrapping logic, does not handle make unitcheck slowcheck subsequentcheck correctly, but that needs fixing there. done with https://gerrit.libreoffice.org/gitweb?p=core.git;a=commit;h=4eebd65858655eef3f39e40ecbe74c505f6b4688 Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/core/opencl/formulagroupcl.cxx| 13 ++--- sc/source/core/opencl/formulagroupcl_public.hxx |1 + 2 files changed, 11 insertions(+), 3 deletions(-) New commits: commit d7e4e5d35e66dbfcc30576d198e393661d84f616 Author: I-Jui (Ray) Sung r...@multicorewareinc.com Date: Tue Nov 19 00:22:23 2013 -0600 GPU Calc: add an inline function to legalize inputs for reduction. Change-Id: Ibcede4a33d7b8b1073d6ecfb49abbc78b31a2f35 diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index 037760e..abd3230 100644 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -470,11 +470,18 @@ public: ss int loopOffset = l*512;\n; ss if((loopOffset + lidx + offset + 256) min( offset + windowSize, arrayLength))\n; ss tmp = ; -ss mpCodeGen-Gen2(fsum(A[loopOffset + lidx + offset], 0), -fsum(A[loopOffset + lidx + offset + 256], 0)); +ss mpCodeGen-Gen2( +std::string( +legalize(A[loopOffset + lidx + offset], )+ +mpCodeGen-GetBottom() +), +std::string( +legalize(A[loopOffset + lidx + offset + 256], )+ +mpCodeGen-GetBottom() +) +); ss ;; ss else if ((loopOffset + lidx + offset) min(offset + windowSize, arrayLength))\n; -ss tmp = fsum(A[loopOffset + lidx + offset], 0);\n; +ss tmp = legalize(A[loopOffset + lidx + offset],; +ss mpCodeGen-GetBottom() );\n; ss shm_buf[lidx] = tmp;\n; ss barrier(CLK_LOCAL_MEM_FENCE);\n; ss for (int i = 128; i 0; i/=2) {\n; diff --git a/sc/source/core/opencl/formulagroupcl_public.hxx b/sc/source/core/opencl/formulagroupcl_public.hxx index e50de37..ccee5e1 100644 --- a/sc/source/core/opencl/formulagroupcl_public.hxx +++ b/sc/source/core/opencl/formulagroupcl_public.hxx @@ -12,6 +12,7 @@ const char* publicFunc = int isNan(double a) { return a != a; }\n + double legalize(double a, double b) { return isNan(a)?b:a; }\n double fsum(double a, double b) { return isNan(a)?b:a+b; }\n double fsub(double a, double b) { return a-b; }\n double fdiv(double a, double b) { return a/b; }\n ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - configure.in
configure.in |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit b653ed6c9780961aa99cb1fc619355c5d2d94dcc Author: Jan Iversen j...@apache.org Date: Tue Nov 19 20:00:28 2013 + WITH_STLPORT is set to NO but the test later is != no. Test is changed to NO, now it works on ubuntu. diff --git a/configure.in b/configure.in index 3df0746..9a3e3c0 100644 --- a/configure.in +++ b/configure.in @@ -2694,8 +2694,8 @@ dnl === dnl Checks for what the default STL should be dnl === AC_MSG_CHECKING([what the default STL should be]) - DEFAULT_TO_STLPORT=no -if test $WITH_STLPORT != no; then + DEFAULT_TO_STLPORT=NO +if test $WITH_STLPORT != NO; then AC_MSG_ERROR([Option --with-stlport is no longer available.]) else USE_SYSTEM_STL=YES ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/ucalc_formula.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 7e77efe8b8f04ba739f731e5a27b5e643fe652fa Author: Tor Lillqvist t...@collabora.com Date: Tue Nov 19 22:04:20 2013 +0200 WaE: unused variable 'aFormula' [loplugin] Change-Id: Ief4acc559113d37902ea89a44d085c89f93e39cf diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx index 29ecd5a..ff89dbe 100644 --- a/sc/qa/unit/ucalc_formula.cxx +++ b/sc/qa/unit/ucalc_formula.cxx @@ -134,7 +134,9 @@ void Test::testFormulaCreateStringFromTokens() for (size_t i = 0, n = SAL_N_ELEMENTS(aTests); i n; ++i) { +#if 0 OUString aFormula = OUString::createFromAscii(aTests[i]); +#endif ScCompiler aComp(m_pDoc, aPos); aComp.SetGrammar(FormulaGrammar::GRAM_ENGLISH); #if 0 // TODO: This call to CompileString() causes the cppunittester to somehow fail on Windows. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Arnaud Versini arnaud.vers...@gmail.com changed: What|Removed |Added Depends on||71694 --- Comment #20 from Arnaud Versini arnaud.vers...@gmail.com --- Adding fdo#71694 can't create Index and tables in pre 4.1.4. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/sax sax/source
include/sax/fastattribs.hxx | 13 sax/source/fastparser/fastparser.cxx | 27 - sax/source/fastparser/fastparser.hxx |4 -- sax/source/tools/fastattribs.cxx | 55 +-- 4 files changed, 62 insertions(+), 37 deletions(-) New commits: commit fc25afaa048033940d9e1d22ec8ba31c5b3e9289 Author: Michael Meeks michael.me...@collabora.com Date: Tue Nov 19 20:51:35 2013 + fastparser: accelerate value tokenisation as well. Change-Id: I99a39e91c684adb1fc92cdb466477cfa90104961 diff --git a/include/sax/fastattribs.hxx b/include/sax/fastattribs.hxx index f4a9392..c780603 100644 --- a/include/sax/fastattribs.hxx +++ b/include/sax/fastattribs.hxx @@ -49,6 +49,18 @@ struct UnknownAttribute typedef std::vector UnknownAttribute UnknownAttributeList; +/// avoid constantly allocating and freeing sequences. +class SAX_DLLPUBLIC FastTokenLookup +{ +static const int mnUtf8BufferSize = 128; +::css::uno::Sequence sal_Int8 maUtf8Buffer; +public: +FastTokenLookup(); +sal_Int32 getTokenFromChars( +const ::css::uno::Reference ::css::xml::sax::XFastTokenHandler mxTokenHandler, +const char *pStr, size_t nLength = 0 ); +}; + class SAX_DLLPUBLIC FastAttributeList : public ::cppu::WeakImplHelper1 ::com::sun::star::xml::sax::XFastAttributeList { public: @@ -83,6 +95,7 @@ private: std::vector sal_Int32 maAttributeTokens; UnknownAttributeList maUnknownAttributes; ::com::sun::star::uno::Reference ::com::sun::star::xml::sax::XFastTokenHandler mxTokenHandler; +FastTokenLookup maTokenLookup; }; } diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx index 5d64a10..8f68051 100644 --- a/sax/source/fastparser/fastparser.cxx +++ b/sax/source/fastparser/fastparser.cxx @@ -348,7 +348,6 @@ Event Entity::getEvent( CallbackType aType ) FastSaxParser::FastSaxParser() { mxDocumentLocator.set( new FastLocatorImpl( this ) ); -maUtf8Buffer.realloc( mnUtf8BufferSize ); } // @@ -381,31 +380,7 @@ void FastSaxParser::DefineNamespace( const OString rPrefix, const sal_Char* pNa sal_Int32 FastSaxParser::GetToken( const sal_Char* pToken, sal_Int32 nLen /* = 0 */ ) { -sal_Int32 nRet; - -if( !nLen ) -nLen = strlen( pToken ); - -if ( nLen mnUtf8BufferSize ) -{ -// Get intimiate with the underlying sequence cf. sal/types.h -sal_Sequence *pSeq = maUtf8Buffer.get(); - -sal_Int32 nPreRefCount = pSeq-nRefCount; - -pSeq-nElements = nLen; -memcpy( pSeq-elements, pToken, nLen ); -nRet = getEntity().mxTokenHandler-getTokenFromUTF8( maUtf8Buffer ); - -(void)nPreRefCount; // for non-debug mode. -assert( pSeq-nRefCount == nPreRefCount ); // callee must not take ref. -} -else -{ -Sequence sal_Int8 aSeq( (sal_Int8*)pToken, nLen ); // heap allocate free -nRet = getEntity().mxTokenHandler-getTokenFromUTF8( aSeq ); -} -return nRet; +return maTokenLookup.getTokenFromChars( getEntity().mxTokenHandler, pToken, nLen ); } // diff --git a/sax/source/fastparser/fastparser.hxx b/sax/source/fastparser/fastparser.hxx index 972ce07..35deb0c 100644 --- a/sax/source/fastparser/fastparser.hxx +++ b/sax/source/fastparser/fastparser.hxx @@ -222,9 +222,7 @@ private: ParserData maData; /// Cached parser configuration for next call of parseStream(). ::std::stack Entity maEntities; /// Entity stack for each call of parseStream(). - -static const int mnUtf8BufferSize = 128; -::css::uno::Sequence sal_Int8 maUtf8Buffer; /// avoid constantly re-allocating this +FastTokenLookup maTokenLookup; }; } diff --git a/sax/source/tools/fastattribs.cxx b/sax/source/tools/fastattribs.cxx index 3ebab23..c0a92a1 100644 --- a/sax/source/tools/fastattribs.cxx +++ b/sax/source/tools/fastattribs.cxx @@ -114,10 +114,9 @@ sal_Int32 FastAttributeList::getValueToken( ::sal_Int32 Token ) throw (SAXExcept { for (size_t i = 0; i maAttributeTokens.size(); ++i) if (maAttributeTokens[i] == Token) -{ -Sequence sal_Int8 aSeq( (sal_Int8*) mpChunk + maAttributeValues[i], AttributeValueLength(i) ); -return mxTokenHandler-getTokenFromUTF8( aSeq ); -} +return maTokenLookup.getTokenFromChars( mxTokenHandler, +mpChunk + maAttributeValues[ i ], +AttributeValueLength( i ) ); throw SAXException(); } @@ -126,10 +125,9 @@ sal_Int32 FastAttributeList::getOptionalValueToken( ::sal_Int32 Token, ::sal_Int { for (size_t i = 0; i maAttributeTokens.size(); ++i) if (maAttributeTokens[i] == Token) -{ -
[Libreoffice-commits] core.git: sc/source sc/uiconfig
sc/source/ui/inc/datastreams.hxx |5 + sc/source/ui/miscdlgs/datastreams.cxx| 72 +--- sc/source/ui/miscdlgs/datastreamsdlg.cxx | 41 +++- sc/uiconfig/scalc/ui/datastreams.ui | 79 +-- 4 files changed, 164 insertions(+), 33 deletions(-) New commits: commit 3d7d66258373c1d4df20cce6a993b3fe013a7910 Author: Matúš Kukan matus.ku...@collabora.com Date: Tue Nov 19 13:57:58 2013 +0100 datastreams: implement address mode for input In this mode, we read lines as address,value. Moving is disabled then, because we update each cell individually (and also, for some reason, it was not working). Change-Id: I55f73e5a6a26f3e962a12662deeea657ce41acd4 diff --git a/sc/source/ui/inc/datastreams.hxx b/sc/source/ui/inc/datastreams.hxx index 8233be1..80f9cd6 100644 --- a/sc/source/ui/inc/datastreams.hxx +++ b/sc/source/ui/inc/datastreams.hxx @@ -30,8 +30,8 @@ public: ~DataStreams(); bool ImportData(); void MoveData(); -void Set(const OUString rUrl, bool bIsScript, const OUString rRange, -sal_Int32 nLimit, MoveEnum eMove); +void Set(const OUString rUrl, bool bIsScript, bool bValuesInLine, +const OUString rRange, sal_Int32 nLimit, MoveEnum eMove); void ShowDialog(Window *pParent); void Start(); void Stop(); @@ -42,6 +42,7 @@ private: MoveEnum meMove; bool mbRunning; bool mbIsUndoEnabled; +bool mbValuesInLine; boost::scoped_ptrScRange mpRange; boost::scoped_ptrScRange mpStartRange; boost::scoped_ptrScRange mpEndRange; diff --git a/sc/source/ui/miscdlgs/datastreams.cxx b/sc/source/ui/miscdlgs/datastreams.cxx index dd5a821..b938513 100644 --- a/sc/source/ui/miscdlgs/datastreams.cxx +++ b/sc/source/ui/miscdlgs/datastreams.cxx @@ -18,7 +18,9 @@ #include asciiopt.hxx #include dbfunc.hxx #include docsh.hxx +#include documentimport.hxx #include impex.hxx +#include rangelst.hxx #include tabvwsh.hxx #include viewdata.hxx @@ -115,18 +117,25 @@ void DataStreams::Stop() mpScDocument-EnableUndo(mbIsUndoEnabled); } -void DataStreams::Set(const OUString rUrl, bool bIsScript, +void DataStreams::Set(const OUString rUrl, bool bIsScript, bool bValuesInLine, const OUString rRange, sal_Int32 nLimit, MoveEnum eMove) { -mpRange.reset ( new ScRange() ); -mpRange-Parse(rRange, mpScDocument); -mpStartRange.reset( new ScRange(*mpRange.get()) ); if (bIsScript) mpStream.reset( new SvScriptStream(rUrl) ); else mpStream.reset( new SvFileStream(rUrl, STREAM_READ) ); mpEndRange.reset( NULL ); +mpRange.reset ( new ScRange() ); +mbValuesInLine = bValuesInLine; +if (!mbValuesInLine) +{ +meMove = NO_MOVE; +return; +} + +mpRange-Parse(rRange, mpScDocument); +mpStartRange.reset( new ScRange(*mpRange.get()) ); meMove = eMove; sal_Int32 nHeight = mpRange-aEnd.Row() - mpRange-aStart.Row() + 1; nLimit = nHeight * (nLimit / nHeight); @@ -168,21 +177,52 @@ bool DataStreams::ImportData() return mbRunning; } -SCROW nHeight = mpRange-aEnd.Row() - mpRange-aStart.Row() + 1; -OStringBuffer aBuf; OString sTmp; -while (nHeight--) -{ -mpStream-ReadLine(sTmp); -aBuf.append(sTmp); -aBuf.append('\n'); -} SolarMutexGuard aGuard; MoveData(); -SvMemoryStream aMemoryStream((void *)aBuf.getStr(), aBuf.getLength(), STREAM_READ); -ScImportExport aImport(mpScDocument, *mpRange); -aImport.SetSeparator(','); -aImport.ImportStream(aMemoryStream, OUString(), FORMAT_STRING); +if (mbValuesInLine) +{ +SCROW nHeight = mpRange-aEnd.Row() - mpRange-aStart.Row() + 1; +OStringBuffer aBuf; +while (nHeight--) +{ +mpStream-ReadLine(sTmp); +aBuf.append(sTmp); +aBuf.append('\n'); +} +SvMemoryStream aMemoryStream((void *)aBuf.getStr(), aBuf.getLength(), STREAM_READ); +ScImportExport aImport(mpScDocument, *mpRange); +aImport.SetSeparator(','); +aImport.ImportStream(aMemoryStream, OUString(), FORMAT_STRING); +} +else +{ +ScRangeList aRangeList; +ScDocumentImport aDocImport(*mpScDocument); +// read more lines at once but not too much +for (int i = 0; i 10; ++i) +{ +mpStream-ReadLine(sTmp); +OUString sLine(OStringToOUString(sTmp, RTL_TEXTENCODING_UTF8)); +if (sLine.indexOf(',') = 0) +continue; + +OUString sAddress( sLine.copy(0, sLine.indexOf(',')) ); +OUString sValue( sLine.copy(sLine.indexOf(',') + 1) ); +ScAddress aAddress; +aAddress.Parse(sAddress, mpScDocument); +if (!aAddress.IsValid()) +continue; + +if (sValue == 0 || ( sValue.indexOf(':') == -1 sValue.toDouble()
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - configure.in
configure.in |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 48cc2c44aa27db91200bd12406fee7ab1f49fba1 Author: Jan Iversen j...@apache.org Date: Tue Nov 19 20:15:24 2013 + WITH_STLPORT changed from NO to no, due to a standard set function diff --git a/configure.in b/configure.in index 9a3e3c0..a93c1cd 100644 --- a/configure.in +++ b/configure.in @@ -644,7 +644,7 @@ AC_ARG_WITH(system-redland, ],,) AC_ARG_WITH(stlport, [ --with-stlport Only building --without-stlport is supported. -], WITH_STLPORT=$withval , WITH_STLPORT=NO) +], WITH_STLPORT=$withval , WITH_STLPORT=no) AC_ARG_WITH(jdk-home, [ --with-jdk-home if you have installed JDK 1.3 or later on your system please supply the path here. @@ -2694,8 +2694,8 @@ dnl === dnl Checks for what the default STL should be dnl === AC_MSG_CHECKING([what the default STL should be]) - DEFAULT_TO_STLPORT=NO -if test $WITH_STLPORT != NO; then + DEFAULT_TO_STLPORT=no +if test $WITH_STLPORT != no; then AC_MSG_ERROR([Option --with-stlport is no longer available.]) else USE_SYSTEM_STL=YES ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/opencl/formulagroupcl.cxx | 290 +++ 1 file changed, 186 insertions(+), 104 deletions(-) New commits: commit 2c39e778873f10037721d844697962dc41e3bcc3 Author: I-Jui (Ray) Sung r...@multicorewareinc.com Date: Tue Nov 19 16:42:56 2013 -0600 GPU Calc: separate out parallel reduction from DynamicKernelSlidingArgument Create a new class ParallelReductionVectorRef to straighten out code generation and marshaling logic between sequential and parallel code generation alternatives. Change-Id: Id029ad441f80712f8e7396dcd985e3363ce08ff8 diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index abd3230..388605c 100644 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -409,6 +409,7 @@ protected: /// Handling a Double Vector that is used as a sliding window input /// to either a sliding window average or sum-of-products +/// Generate a sequential loop for reductions class OpSum; // Forward Declaration class OpAverage; // Forward Declaration class OpMin; // Forward Declaration @@ -430,79 +431,8 @@ public: bIsStartFixed = mpDVR-IsStartFixed(); bIsEndFixed = mpDVR-IsEndFixed(); } -virtual bool NeedParallelReduction(void) const -{ -if ((dynamic_castOpSum*(mpCodeGen.get()) - !dynamic_castOpAverage*(mpCodeGen.get())) || -dynamic_castOpMin*(mpCodeGen.get()) || -dynamic_castOpMax*(mpCodeGen.get()) || -dynamic_castOpSumIfs*(mpCodeGen.get())) -return GetWindowSize() 100 -( (GetStartFixed() GetEndFixed()) || - (!GetStartFixed() !GetEndFixed()) ) ; -else -return false; -} -virtual void GenSlidingWindowFunction(std::stringstream ss) { -if (!dynamic_castOpSumIfs*(mpCodeGen.get()) - NeedParallelReduction()) -{ -std::string name = Base::GetName(); -ss __kernel void name; -ss _reduction(__global double* A, -__global double *result,int arrayLength,int windowSize){\n; -ss double tmp, current_result = -mpCodeGen-GetBottom(); -ss ;\n; -ss int writePos = get_group_id(1);\n; -ss int lidx = get_local_id(0);\n; -ss __local double shm_buf[256];\n; -if (mpDVR-IsStartFixed() mpDVR-IsEndFixed()) -ss int offset = 0;\n; -else if (!mpDVR-IsStartFixed() !mpDVR-IsEndFixed()) -ss int offset = get_group_id(1);\n; -else -throw Unhandled(); -ss barrier(CLK_LOCAL_MEM_FENCE);\n; -ss int loop = arrayLength/512 + 1;\n; -ss for (int l=0; lloop; l++){\n; -ss tmp = mpCodeGen-GetBottom() ;\n; -ss int loopOffset = l*512;\n; -ss if((loopOffset + lidx + offset + 256) min( offset + windowSize, arrayLength))\n; -ss tmp = ; -ss mpCodeGen-Gen2( -std::string( -legalize(A[loopOffset + lidx + offset], )+ -mpCodeGen-GetBottom() +), -std::string( -legalize(A[loopOffset + lidx + offset + 256], )+ -mpCodeGen-GetBottom() +) -); -ss ;; -ss else if ((loopOffset + lidx + offset) min(offset + windowSize, arrayLength))\n; -ss tmp = legalize(A[loopOffset + lidx + offset],; -ss mpCodeGen-GetBottom() );\n; -ss shm_buf[lidx] = tmp;\n; -ss barrier(CLK_LOCAL_MEM_FENCE);\n; -ss for (int i = 128; i 0; i/=2) {\n; -ss if (lidx i)\n; -ss shm_buf[lidx] = ; -ss mpCodeGen-Gen2(shm_buf[lidx], shm_buf[lidx + i]); -ss ;; -ss barrier(CLK_LOCAL_MEM_FENCE);\n; -ss }\n; -ss if (lidx == 0)\n; -ss current_result =; -ss mpCodeGen-Gen2(current_result, shm_buf[0]); -ss ;\n; -ss barrier(CLK_LOCAL_MEM_FENCE);\n; -ss }\n; -ss if (lidx == 0)\n; -ss result[writePos] = current_result;\n; -ss }\n; -} - } +virtual void GenSlidingWindowFunction(std::stringstream ) {} virtual std::string GenSlidingWindowDeclRef(bool=false) const { @@ -519,26 +449,7 @@ public: { assert(mpDVR); size_t nCurWindowSize = mpDVR-GetRefRowSize(); -if (!dynamic_castOpSumIfs*(mpCodeGen.get()) - NeedParallelReduction()) -{ -if ((!bIsStartFixed !bIsEndFixed) || -
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter-4' - sc/source
sc/source/core/opencl/formulagroupcl.cxx | 290 +++ 1 file changed, 186 insertions(+), 104 deletions(-) New commits: commit cd67d819b45054ee8cbbb6a0cb261f3ef9b5b659 Author: I-Jui (Ray) Sung r...@multicorewareinc.com Date: Tue Nov 19 16:42:56 2013 -0600 GPU Calc: separate out parallel reduction from DynamicKernelSlidingArgument Create a new class ParallelReductionVectorRef to straighten out code generation and marshaling logic between sequential and parallel code generation alternatives. Change-Id: Id029ad441f80712f8e7396dcd985e3363ce08ff8 diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index 2d806aa..87f4d89 100644 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -409,6 +409,7 @@ protected: /// Handling a Double Vector that is used as a sliding window input /// to either a sliding window average or sum-of-products +/// Generate a sequential loop for reductions class OpSum; // Forward Declaration class OpAverage; // Forward Declaration class OpMin; // Forward Declaration @@ -430,79 +431,8 @@ public: bIsStartFixed = mpDVR-IsStartFixed(); bIsEndFixed = mpDVR-IsEndFixed(); } -virtual bool NeedParallelReduction(void) const -{ -if ((dynamic_castOpSum*(mpCodeGen.get()) - !dynamic_castOpAverage*(mpCodeGen.get())) || -dynamic_castOpMin*(mpCodeGen.get()) || -dynamic_castOpMax*(mpCodeGen.get()) || -dynamic_castOpSumIfs*(mpCodeGen.get())) -return GetWindowSize() 100 -( (GetStartFixed() GetEndFixed()) || - (!GetStartFixed() !GetEndFixed()) ) ; -else -return false; -} -virtual void GenSlidingWindowFunction(std::stringstream ss) { -if (!dynamic_castOpSumIfs*(mpCodeGen.get()) - NeedParallelReduction()) -{ -std::string name = Base::GetName(); -ss __kernel void name; -ss _reduction(__global double* A, -__global double *result,int arrayLength,int windowSize){\n; -ss double tmp, current_result = -mpCodeGen-GetBottom(); -ss ;\n; -ss int writePos = get_group_id(1);\n; -ss int lidx = get_local_id(0);\n; -ss __local double shm_buf[256];\n; -if (mpDVR-IsStartFixed() mpDVR-IsEndFixed()) -ss int offset = 0;\n; -else if (!mpDVR-IsStartFixed() !mpDVR-IsEndFixed()) -ss int offset = get_group_id(1);\n; -else -throw Unhandled(); -ss barrier(CLK_LOCAL_MEM_FENCE);\n; -ss int loop = arrayLength/512 + 1;\n; -ss for (int l=0; lloop; l++){\n; -ss tmp = mpCodeGen-GetBottom() ;\n; -ss int loopOffset = l*512;\n; -ss if((loopOffset + lidx + offset + 256) min( offset + windowSize, arrayLength))\n; -ss tmp = ; -ss mpCodeGen-Gen2( -std::string( -legalize(A[loopOffset + lidx + offset], )+ -mpCodeGen-GetBottom() +), -std::string( -legalize(A[loopOffset + lidx + offset + 256], )+ -mpCodeGen-GetBottom() +) -); -ss ;; -ss else if ((loopOffset + lidx + offset) min(offset + windowSize, arrayLength))\n; -ss tmp = legalize(A[loopOffset + lidx + offset],; -ss mpCodeGen-GetBottom() );\n; -ss shm_buf[lidx] = tmp;\n; -ss barrier(CLK_LOCAL_MEM_FENCE);\n; -ss for (int i = 128; i 0; i/=2) {\n; -ss if (lidx i)\n; -ss shm_buf[lidx] = ; -ss mpCodeGen-Gen2(shm_buf[lidx], shm_buf[lidx + i]); -ss ;; -ss barrier(CLK_LOCAL_MEM_FENCE);\n; -ss }\n; -ss if (lidx == 0)\n; -ss current_result =; -ss mpCodeGen-Gen2(current_result, shm_buf[0]); -ss ;\n; -ss barrier(CLK_LOCAL_MEM_FENCE);\n; -ss }\n; -ss if (lidx == 0)\n; -ss result[writePos] = current_result;\n; -ss }\n; -} - } +virtual void GenSlidingWindowFunction(std::stringstream ) {} virtual std::string GenSlidingWindowDeclRef(bool=false) const { @@ -519,26 +449,7 @@ public: { assert(mpDVR); size_t nCurWindowSize = mpDVR-GetRefRowSize(); -if (!dynamic_castOpSumIfs*(mpCodeGen.get()) - NeedParallelReduction()) -{ -if ((!bIsStartFixed !bIsEndFixed) || -
[Libreoffice-commits] core.git: sc/source
sc/source/core/opencl/formulagroupcl.cxx | 26 -- 1 file changed, 8 insertions(+), 18 deletions(-) New commits: commit 726ccd5ae1ab6608497e4aac8c62a5206488a0fb Author: I-Jui (Ray) Sung r...@multicorewareinc.com Date: Tue Nov 19 19:24:06 2013 -0600 GPU Calc: parallel reduction version of COUNT Change-Id: Ia90b5aaf044379b5bfc55ec525f9be2f6fda6028 diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index 388605c..3e40716 100644 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -687,19 +687,13 @@ public: ss tmp = mpCodeGen-GetBottom() ;\n; ss int loopOffset = l*512;\n; ss if((loopOffset + lidx + offset + 256) min( offset + windowSize, arrayLength))\n; -ss tmp = ; -ss mpCodeGen-Gen2( -std::string( -legalize(A[loopOffset + lidx + offset], )+ -mpCodeGen-GetBottom() +), -std::string( -legalize(A[loopOffset + lidx + offset + 256], )+ -mpCodeGen-GetBottom() +) -); -ss ;\n; +ss tmp = mpCodeGen-Gen2( +A[loopOffset + lidx + offset], tmp) ;\n; +ss tmp = mpCodeGen-Gen2( +A[loopOffset + lidx + offset + 256], tmp) ;\n; ss else if ((loopOffset + lidx + offset) min(offset + windowSize, arrayLength))\n; -ss tmp = legalize(A[loopOffset + lidx + offset],; -ss mpCodeGen-GetBottom() );\n; +ss tmp = mpCodeGen-Gen2( +A[loopOffset + lidx + offset], tmp) ;\n; ss shm_buf[lidx] = tmp;\n; ss barrier(CLK_LOCAL_MEM_FENCE);\n; ss for (int i = 128; i 0; i/=2) {\n; @@ -1226,11 +1220,7 @@ public: virtual std::string Gen2(const std::string lhs, const std::string rhs) const { std::stringstream ss; -#ifdef ISNAN -ss (0 == lhs )? tmp : ( rhs+1.0); -#else ss (isNan( lhs )?rhs:rhs+1.0); -#endif return ss.str(); } virtual std::string BinFuncName(void) const { return fcount; } @@ -1556,8 +1546,8 @@ DynamicKernelArgument *VectorRefFactory(const std::string s, { return new DynamicKernelSlidingArgumentBase(s, ft, pCodeGen, index); } -// COUNT is not supported yet -else if (dynamic_castOpCount*(pCodeGen.get())) +// Sub is not a reduction per se +else if (dynamic_castOpSub*(pCodeGen.get())) { return new DynamicKernelSlidingArgumentBase(s, ft, pCodeGen, index); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter-4' - sc/source
sc/source/core/opencl/formulagroupcl.cxx | 26 -- 1 file changed, 8 insertions(+), 18 deletions(-) New commits: commit 06c8a7a20517441e3f001a993cbeaa4e3fa69a54 Author: I-Jui (Ray) Sung r...@multicorewareinc.com Date: Tue Nov 19 19:24:06 2013 -0600 GPU Calc: parallel reduction version of COUNT Change-Id: Ia90b5aaf044379b5bfc55ec525f9be2f6fda6028 diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index 87f4d89..d283174 100644 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -687,19 +687,13 @@ public: ss tmp = mpCodeGen-GetBottom() ;\n; ss int loopOffset = l*512;\n; ss if((loopOffset + lidx + offset + 256) min( offset + windowSize, arrayLength))\n; -ss tmp = ; -ss mpCodeGen-Gen2( -std::string( -legalize(A[loopOffset + lidx + offset], )+ -mpCodeGen-GetBottom() +), -std::string( -legalize(A[loopOffset + lidx + offset + 256], )+ -mpCodeGen-GetBottom() +) -); -ss ;\n; +ss tmp = mpCodeGen-Gen2( +A[loopOffset + lidx + offset], tmp) ;\n; +ss tmp = mpCodeGen-Gen2( +A[loopOffset + lidx + offset + 256], tmp) ;\n; ss else if ((loopOffset + lidx + offset) min(offset + windowSize, arrayLength))\n; -ss tmp = legalize(A[loopOffset + lidx + offset],; -ss mpCodeGen-GetBottom() );\n; +ss tmp = mpCodeGen-Gen2( +A[loopOffset + lidx + offset], tmp) ;\n; ss shm_buf[lidx] = tmp;\n; ss barrier(CLK_LOCAL_MEM_FENCE);\n; ss for (int i = 128; i 0; i/=2) {\n; @@ -1226,11 +1220,7 @@ public: virtual std::string Gen2(const std::string lhs, const std::string rhs) const { std::stringstream ss; -#ifdef ISNAN -ss (0 == lhs )? tmp : ( rhs+1.0); -#else ss (isNan( lhs )?rhs:rhs+1.0); -#endif return ss.str(); } virtual std::string BinFuncName(void) const { return fcount; } @@ -1556,8 +1546,8 @@ DynamicKernelArgument *VectorRefFactory(const std::string s, { return new DynamicKernelSlidingArgumentBase(s, ft, pCodeGen, index); } -// COUNT is not supported yet -else if (dynamic_castOpCount*(pCodeGen.get())) +// Sub is not a reduction per se +else if (dynamic_castOpSub*(pCodeGen.get())) { return new DynamicKernelSlidingArgumentBase(s, ft, pCodeGen, index); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - connectivity/source
connectivity/source/commontools/FValue.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit ee3c1ac606771549b1b5a853c87b090b573f5e03 Author: Julien Nabet serval2...@yahoo.fr Date: Mon Nov 18 22:15:29 2013 +0100 Fix some wrong copy paste Change-Id: I3ad6f62393cb22b350d6b50086963ebc7d2a8f5e Reviewed-on: https://gerrit.libreoffice.org/6715 Reviewed-by: Lionel Elie Mamane lio...@mamane.lu Tested-by: Lionel Elie Mamane lio...@mamane.lu diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx index 57d4623..b9099c6 100644 --- a/connectivity/source/commontools/FValue.cxx +++ b/connectivity/source/commontools/FValue.cxx @@ -1551,9 +1551,9 @@ sal_uInt32 ORowSetValue::getUInt32() const break; case DataType::BIGINT: if ( m_bSigned ) -nRet = static_castsal_Int32(m_aValue.m_nInt64); +nRet = static_castsal_uInt32(m_aValue.m_nInt64); else -nRet = static_castsal_Int32(m_aValue.m_uInt64); +nRet = static_castsal_uInt32(m_aValue.m_uInt64); break; default: { @@ -1682,7 +1682,7 @@ sal_uInt64 ORowSetValue::getULong() const if ( m_bSigned ) nRet = m_aValue.m_nInt8; else -nRet = m_aValue.m_uInt16; +nRet = m_aValue.m_uInt8; break; case DataType::SMALLINT: if ( m_bSigned ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter-4' - 2 commits - sc/source
sc/source/core/opencl/formulagroupcl.cxx | 99 +++ 1 file changed, 48 insertions(+), 51 deletions(-) New commits: commit 8441dd5c9aa58e00fd1d70f68df2d624120007a9 Author: I-Jui (Ray) Sung r...@multicorewareinc.com Date: Tue Nov 19 22:21:24 2013 -0600 GPU Calc: Fix COUNT() regression Change-Id: I1b313d7f5f144f1884abe60c816db1fd6a643489 diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index 0a33eb7..dbefbf8 100644 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -24,8 +24,11 @@ #include op_logical.hxx #include op_statistical.hxx #include op_array.hxx +/// CONFIGURATIONS // Comment out this to turn off FMIN and FMAX intrinsics #define USE_FMIN_FMAX 1 +#define REDUCE_THRESHOLD 4 // set to 4 for correctness testing. priority 1 +#define UNROLLING_FACTOR 16 // set to 4 for correctness testing (if no reduce) #include formulagroupcl_public.hxx #include list @@ -41,7 +44,6 @@ #include boost/scoped_ptr.hpp -#define UNROLLING using namespace formula; @@ -414,6 +416,7 @@ class OpSum; // Forward Declaration class OpAverage; // Forward Declaration class OpMin; // Forward Declaration class OpMax; // Forward Declaration +class OpCount; // Forward Declaration templateclass Base class DynamicKernelSlidingArgument: public Base { @@ -450,7 +453,7 @@ public: assert(mpDVR); size_t nCurWindowSize = mpDVR-GetRefRowSize(); // original for loop -#ifndef UNROLLING +#ifndef UNROLLING_FACTOR needBody = true; // No need to generate a for-loop for degenerated cases if (nCurWindowSize == 1) @@ -497,7 +500,7 @@ public: return nCurWindowSize; #endif -#ifdef UNROLLING +#ifdef UNROLLING_FACTOR { if (!mpDVR-IsStartFixed() mpDVR-IsEndFixed()) { ss for (int i = ; @@ -515,7 +518,7 @@ return nCurWindowSize; ss tmpBottom = mpCodeGen-GetBottom() ;\n\t; ss {int i;\n\t; std::stringstream temp1,temp2; -int outLoopSize = 16; +int outLoopSize = UNROLLING_FACTOR; if ( nCurWindowSize/outLoopSize != 0){ ss for(int outLoop=0; outLoop nCurWindowSize/outLoopSize ; outLoop++){\n\t; for(int count=0; count outLoopSize; count++){ @@ -523,18 +526,10 @@ return nCurWindowSize; if(count==0){ temp1 if(i + gid0 mpDVR-GetArrayLength(); temp1 ){\n\t\t; -temp1 if (isNan(; -temp1 GenSlidingWindowDeclRef(); -temp1 )){\n\t\t\t; -temp1 tmp = ; -temp1 mpCodeGen-Gen2(tmpBottom, tmp) ;\n\t\t; -temp1 }else{\n\t\t\t; -temp1 tmp = ; temp1 mpCodeGen-Gen2(GenSlidingWindowDeclRef(), tmp); temp1 ;\n\t\t\t; temp1 nCount += 1;\n\t\t; temp1 }\n\t; -temp1 }\n\t; } ss temp1.str(); } @@ -546,18 +541,11 @@ return nCurWindowSize; if(count==nCurWindowSize/outLoopSize*outLoopSize){ temp2 if(i + gid0mpDVR-GetArrayLength(); temp2 ){\n\t\t; -temp2 if (isNan(; -temp2 GenSlidingWindowDeclRef(); -temp2 )){\n\t\t\t; -temp2 tmp = ; -temp2 mpCodeGen-Gen2(tmpBottom, tmp) ;\n\t\t; -temp2 }else{\n\t\t\t; temp2 tmp = ; temp2 mpCodeGen-Gen2(GenSlidingWindowDeclRef(), tmp); temp2 ;\n\t\t\t; temp2 nCount += 1;\n\t\t; temp2 }\n\t; -temp2 }\n\t; } ss temp2.str(); } @@ -571,23 +559,16 @@ return nCurWindowSize; ss tmpBottom = mpCodeGen-GetBottom() ;\n\t; ss {int i;\n\t; std::stringstream temp1,temp2; -int outLoopSize = 16; +int outLoopSize = UNROLLING_FACTOR; if (nCurWindowSize/outLoopSize != 0){ ss for(int outLoop=0; outLoop nCurWindowSize/outLoopSize ; outLoop++){\n\t; for(int count=0; count outLoopSize; count++){ ss i = outLoop*outLoopSize+count;\n\t; if(count==0){ -temp1 if (isNan(; -temp1
[Libreoffice-commits] core.git: 2 commits - sc/source
sc/source/core/opencl/formulagroupcl.cxx | 99 +++ 1 file changed, 48 insertions(+), 51 deletions(-) New commits: commit 38b2f25fd6371f45d8f0c997b6e4d14efdf150d3 Author: I-Jui (Ray) Sung r...@multicorewareinc.com Date: Tue Nov 19 22:21:24 2013 -0600 GPU Calc: Fix COUNT() regression Change-Id: I1b313d7f5f144f1884abe60c816db1fd6a643489 diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index a457248..f480e54 100644 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -24,8 +24,11 @@ #include op_logical.hxx #include op_statistical.hxx #include op_array.hxx +/// CONFIGURATIONS // Comment out this to turn off FMIN and FMAX intrinsics #define USE_FMIN_FMAX 1 +#define REDUCE_THRESHOLD 4 // set to 4 for correctness testing. priority 1 +#define UNROLLING_FACTOR 16 // set to 4 for correctness testing (if no reduce) #include formulagroupcl_public.hxx #include list @@ -41,7 +44,6 @@ #include boost/scoped_ptr.hpp -#define UNROLLING using namespace formula; @@ -414,6 +416,7 @@ class OpSum; // Forward Declaration class OpAverage; // Forward Declaration class OpMin; // Forward Declaration class OpMax; // Forward Declaration +class OpCount; // Forward Declaration templateclass Base class DynamicKernelSlidingArgument: public Base { @@ -450,7 +453,7 @@ public: assert(mpDVR); size_t nCurWindowSize = mpDVR-GetRefRowSize(); // original for loop -#ifndef UNROLLING +#ifndef UNROLLING_FACTOR needBody = true; // No need to generate a for-loop for degenerated cases if (nCurWindowSize == 1) @@ -497,7 +500,7 @@ public: return nCurWindowSize; #endif -#ifdef UNROLLING +#ifdef UNROLLING_FACTOR { if (!mpDVR-IsStartFixed() mpDVR-IsEndFixed()) { ss for (int i = ; @@ -515,7 +518,7 @@ return nCurWindowSize; ss tmpBottom = mpCodeGen-GetBottom() ;\n\t; ss {int i;\n\t; std::stringstream temp1,temp2; -int outLoopSize = 16; +int outLoopSize = UNROLLING_FACTOR; if ( nCurWindowSize/outLoopSize != 0){ ss for(int outLoop=0; outLoop nCurWindowSize/outLoopSize ; outLoop++){\n\t; for(int count=0; count outLoopSize; count++){ @@ -523,18 +526,10 @@ return nCurWindowSize; if(count==0){ temp1 if(i + gid0 mpDVR-GetArrayLength(); temp1 ){\n\t\t; -temp1 if (isNan(; -temp1 GenSlidingWindowDeclRef(); -temp1 )){\n\t\t\t; -temp1 tmp = ; -temp1 mpCodeGen-Gen2(tmpBottom, tmp) ;\n\t\t; -temp1 }else{\n\t\t\t; -temp1 tmp = ; temp1 mpCodeGen-Gen2(GenSlidingWindowDeclRef(), tmp); temp1 ;\n\t\t\t; temp1 nCount += 1;\n\t\t; temp1 }\n\t; -temp1 }\n\t; } ss temp1.str(); } @@ -546,18 +541,11 @@ return nCurWindowSize; if(count==nCurWindowSize/outLoopSize*outLoopSize){ temp2 if(i + gid0mpDVR-GetArrayLength(); temp2 ){\n\t\t; -temp2 if (isNan(; -temp2 GenSlidingWindowDeclRef(); -temp2 )){\n\t\t\t; -temp2 tmp = ; -temp2 mpCodeGen-Gen2(tmpBottom, tmp) ;\n\t\t; -temp2 }else{\n\t\t\t; temp2 tmp = ; temp2 mpCodeGen-Gen2(GenSlidingWindowDeclRef(), tmp); temp2 ;\n\t\t\t; temp2 nCount += 1;\n\t\t; temp2 }\n\t; -temp2 }\n\t; } ss temp2.str(); } @@ -571,23 +559,16 @@ return nCurWindowSize; ss tmpBottom = mpCodeGen-GetBottom() ;\n\t; ss {int i;\n\t; std::stringstream temp1,temp2; -int outLoopSize = 16; +int outLoopSize = UNROLLING_FACTOR; if (nCurWindowSize/outLoopSize != 0){ ss for(int outLoop=0; outLoop nCurWindowSize/outLoopSize ; outLoop++){\n\t; for(int count=0; count outLoopSize; count++){ ss i = outLoop*outLoopSize+count;\n\t; if(count==0){ -temp1 if (isNan(; -temp1
[Libreoffice-commits] core.git: sc/source
sc/source/core/opencl/formulagroupcl.cxx| 22 -- sc/source/core/opencl/formulagroupcl_public.hxx |6 +- 2 files changed, 17 insertions(+), 11 deletions(-) New commits: commit 5b1480e33d71ee49bcfb73b3a0144ca6fc2c5e6b Author: I-Jui (Ray) Sung r...@multicorewareinc.com Date: Tue Nov 19 22:53:42 2013 -0600 GPU Calc: optimize average() handling Change-Id: I2f9a813e15068867f218631e9ebadd3ea2c38c95 diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index f480e54..40df1ae 100644 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -528,7 +528,6 @@ return nCurWindowSize; temp1 ){\n\t\t; temp1 mpCodeGen-Gen2(GenSlidingWindowDeclRef(), tmp); temp1 ;\n\t\t\t; -temp1 nCount += 1;\n\t\t; temp1 }\n\t; } ss temp1.str(); @@ -544,7 +543,6 @@ return nCurWindowSize; temp2 tmp = ; temp2 mpCodeGen-Gen2(GenSlidingWindowDeclRef(), tmp); temp2 ;\n\t\t\t; -temp2 nCount += 1;\n\t\t; temp2 }\n\t; } ss temp2.str(); @@ -568,7 +566,6 @@ return nCurWindowSize; temp1 tmp = ; temp1 mpCodeGen-Gen2(GenSlidingWindowDeclRef(), tmp); temp1 ;\n\t\t\t; -temp1 nCount += 1;\n\t\t; } ss temp1.str(); } @@ -581,7 +578,6 @@ return nCurWindowSize; temp2 tmp = ; temp2 mpCodeGen-Gen2(GenSlidingWindowDeclRef(), tmp); temp2 ;\n\t\t\t; -temp2 nCount += 1;\n\t\t; } ss temp2.str(); } @@ -847,7 +843,8 @@ public: ss ) {\n\t; ss double tmp = GetBottom() ;\n\t; ss int gid0 = get_global_id(0);\n\t; -ss int nCount = 0;\n\t; +if (isAverage()) +ss int nCount = 0;\n\t; ss double tmpBottom;\n\t; unsigned i = vSubArguments.size(); size_t nItems = 0; @@ -901,9 +898,6 @@ public: } else { -#ifdef ISNAN -ss nCount += 1;\n\t\t; -#endif nItems += 1; } } @@ -920,7 +914,6 @@ public: ss tmp = ; ss Gen2(vSubArguments[i]-GenSlidingWindowDeclRef(), tmp); ss ;\n\t\t\t; -ss nCount += 1;\n\t\t; ss }\n\t; ss }\n\t; } @@ -1266,7 +1259,16 @@ public: virtual std::string BinFuncName(void) const { return fsum; } }; -class OpAverage: public OpSum { +class OpAverage: public Reduction { +public: +virtual std::string GetBottom(void) { return 0; } +virtual std::string Gen2(const std::string lhs, const std::string rhs) const +{ +std::stringstream ss; +ss fsum_count( lhs , rhs, nCount); +return ss.str(); +} +virtual std::string BinFuncName(void) const { return fsum; } virtual bool isAverage() const { return true; } }; diff --git a/sc/source/core/opencl/formulagroupcl_public.hxx b/sc/source/core/opencl/formulagroupcl_public.hxx index ccee5e1..d001a06 100644 --- a/sc/source/core/opencl/formulagroupcl_public.hxx +++ b/sc/source/core/opencl/formulagroupcl_public.hxx @@ -12,7 +12,11 @@ const char* publicFunc = int isNan(double a) { return a != a; }\n - double legalize(double a, double b) { return isNan(a)?b:a; }\n + double fsum_count(double a, double b, __private int *p) {\n + bool t = isNan(a);\n + (*p) += t?0:1;\n + return t?b:a+b;\n + }\n double fsum(double a, double b) { return isNan(a)?b:a+b; }\n double fsub(double a, double b) { return a-b; }\n double fdiv(double a, double b) { return a/b; }\n ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter-4' - sc/source
sc/source/core/opencl/formulagroupcl.cxx| 22 -- sc/source/core/opencl/formulagroupcl_public.hxx |6 +- 2 files changed, 17 insertions(+), 11 deletions(-) New commits: commit 1f3c1592da05740e695ef3502ca8f3cb4cdaa62b Author: I-Jui (Ray) Sung r...@multicorewareinc.com Date: Tue Nov 19 22:53:42 2013 -0600 GPU Calc: optimize average() handling Change-Id: I2f9a813e15068867f218631e9ebadd3ea2c38c95 diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index dbefbf8..6e4df20 100644 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -528,7 +528,6 @@ return nCurWindowSize; temp1 ){\n\t\t; temp1 mpCodeGen-Gen2(GenSlidingWindowDeclRef(), tmp); temp1 ;\n\t\t\t; -temp1 nCount += 1;\n\t\t; temp1 }\n\t; } ss temp1.str(); @@ -544,7 +543,6 @@ return nCurWindowSize; temp2 tmp = ; temp2 mpCodeGen-Gen2(GenSlidingWindowDeclRef(), tmp); temp2 ;\n\t\t\t; -temp2 nCount += 1;\n\t\t; temp2 }\n\t; } ss temp2.str(); @@ -568,7 +566,6 @@ return nCurWindowSize; temp1 tmp = ; temp1 mpCodeGen-Gen2(GenSlidingWindowDeclRef(), tmp); temp1 ;\n\t\t\t; -temp1 nCount += 1;\n\t\t; } ss temp1.str(); } @@ -581,7 +578,6 @@ return nCurWindowSize; temp2 tmp = ; temp2 mpCodeGen-Gen2(GenSlidingWindowDeclRef(), tmp); temp2 ;\n\t\t\t; -temp2 nCount += 1;\n\t\t; } ss temp2.str(); } @@ -847,7 +843,8 @@ public: ss ) {\n\t; ss double tmp = GetBottom() ;\n\t; ss int gid0 = get_global_id(0);\n\t; -ss int nCount = 0;\n\t; +if (isAverage()) +ss int nCount = 0;\n\t; ss double tmpBottom;\n\t; unsigned i = vSubArguments.size(); size_t nItems = 0; @@ -901,9 +898,6 @@ public: } else { -#ifdef ISNAN -ss nCount += 1;\n\t\t; -#endif nItems += 1; } } @@ -920,7 +914,6 @@ public: ss tmp = ; ss Gen2(vSubArguments[i]-GenSlidingWindowDeclRef(), tmp); ss ;\n\t\t\t; -ss nCount += 1;\n\t\t; ss }\n\t; ss }\n\t; } @@ -1266,7 +1259,16 @@ public: virtual std::string BinFuncName(void) const { return fsum; } }; -class OpAverage: public OpSum { +class OpAverage: public Reduction { +public: +virtual std::string GetBottom(void) { return 0; } +virtual std::string Gen2(const std::string lhs, const std::string rhs) const +{ +std::stringstream ss; +ss fsum_count( lhs , rhs, nCount); +return ss.str(); +} +virtual std::string BinFuncName(void) const { return fsum; } virtual bool isAverage() const { return true; } }; diff --git a/sc/source/core/opencl/formulagroupcl_public.hxx b/sc/source/core/opencl/formulagroupcl_public.hxx index ccee5e1..d001a06 100644 --- a/sc/source/core/opencl/formulagroupcl_public.hxx +++ b/sc/source/core/opencl/formulagroupcl_public.hxx @@ -12,7 +12,11 @@ const char* publicFunc = int isNan(double a) { return a != a; }\n - double legalize(double a, double b) { return isNan(a)?b:a; }\n + double fsum_count(double a, double b, __private int *p) {\n + bool t = isNan(a);\n + (*p) += t?0:1;\n + return t?b:a+b;\n + }\n double fsum(double a, double b) { return isNan(a)?b:a+b; }\n double fsub(double a, double b) { return a-b; }\n double fdiv(double a, double b) { return a/b; }\n ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
LibreOffice Gerrit News for core on 2013-11-20
Moin! * Open changes on master for project core changed in the last 25 hours: + fdo#40315 Change png for moving average trendline in https://gerrit.libreoffice.org/6728 from Laurent BP + fdo#67742 Avoid autocorr of -- before - in https://gerrit.libreoffice.org/6727 from Laurent BP + fdo#71736 add missing Avery labels to label wizard in https://gerrit.libreoffice.org/6725 from Winfried Donkers + fdo#60698: Unify spl and spl_unx in https://gerrit.libreoffice.org/6503 from Marcos Souza + Writer : Fix fdo#71694 by removing instances. in https://gerrit.libreoffice.org/6720 from Arnaud Versini + DOCX: Enhacing unit test para auto spacing in https://gerrit.libreoffice.org/6718 from Nikhil Walvekar + convert delete bitmap querybox to .ui in https://gerrit.libreoffice.org/6717 from Manal Alhassoun * Merged changes on master for project core changed in the last 25 hours: + datastreams: implement address mode for input in https://gerrit.libreoffice.org/6724 from Matúš Kukan + fix Makefile.in in https://gerrit.libreoffice.org/6722 from Björn Michaelsen + related fdo#70414 gbuild to ide: kdevelop in https://gerrit.libreoffice.org/6694 from Björn Michaelsen + fdo#70345 Reuse XStream for Windows platform create a new one for others. in https://gerrit.libreoffice.org/6580 from matthieu gay * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + WIP: fdo#33980 Preserve selection across all slide sorters. in https://gerrit.libreoffice.org/6633 from Andrzej J.R. Hunt + fdo#71043 - Use STACK lint tool to clean code in https://gerrit.libreoffice.org/6529 from José Guilherme Vanz + new cell-border handling in calc in https://gerrit.libreoffice.org/6093 from Viktor Varga + Make ./autogen.sh --help work again in https://gerrit.libreoffice.org/6100 from Arnaud Versini + Increase number of remembered recent documents from 10 to 25 in https://gerrit.libreoffice.org/6101 from Krisztian Pinter + startcenter: Make SC open faster by timeouting thumbnails in https://gerrit.libreoffice.org/6102 from Krisztian Pinter + Remove old outdated gallery images and sounds in https://gerrit.libreoffice.org/4993 from Samuel Mehrbrodt + Simplify oslThreadIdentifier on Linux 32. in https://gerrit.libreoffice.org/5553 from Arnaud Versini + Dynamically align toolbars in LibreOffice in https://gerrit.libreoffice.org/5655 from Prashant Pandey + fdo#36791 : fix for import of greeting card in https://gerrit.libreoffice.org/4240 from Adam CloudOn + more debug logs, extra debug layer, file is not used in p3k in https://gerrit.libreoffice.org/5267 from James Michael Dupont + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn + fdo#64817 : fix for rectangle with image fill in https://gerrit.libreoffice.org/4718 from Adam CloudOn Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 chtfn stephane.guil...@gmail.com changed: What|Removed |Added Depends on||70499 --- Comment #116 from chtfn stephane.guil...@gmail.com --- Nominating Bug 70499 - FILEOPEN Cannot select unprotected cells in XSLX sheet with worksheet protection as it is an issue with anyone needing to fill in partially protected xlsx forms, which potentially affects an array of different cases. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sax/source
sax/source/tools/fastattribs.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ada73e588fe0f948bf49591974f466602452fd10 Author: Miklos Vajna vmik...@collabora.co.uk Date: Wed Nov 20 07:49:00 2013 +0100 sax: -Werror=sign-compare Change-Id: I2e7d482b29fc5859c32fa1731a5f1fd551509e88 diff --git a/sax/source/tools/fastattribs.cxx b/sax/source/tools/fastattribs.cxx index c0a92a1..4b591a0 100644 --- a/sax/source/tools/fastattribs.cxx +++ b/sax/source/tools/fastattribs.cxx @@ -194,7 +194,7 @@ sal_Int32 FastTokenLookup::getTokenFromChars( if( !nLen ) nLen = strlen( pToken ); -if ( nLen mnUtf8BufferSize ) +if ( static_castsal_Int32(nLen) mnUtf8BufferSize ) { // Get intimiate with the underlying sequence cf. sal/types.h sal_Sequence *pSeq = maUtf8Buffer.get(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/IDocumentOutlineNodes.hxx|3 ++- sw/inc/doc.hxx |3 ++- sw/inc/ndtxt.hxx|3 ++- sw/source/core/doc/docnum.cxx |5 +++-- sw/source/core/fields/chpfld.cxx|2 +- sw/source/core/fields/reffld.cxx|2 +- sw/source/core/text/EnhancedPDFExportHelper.cxx |2 +- sw/source/core/txtnode/ndtxt.cxx| 10 ++ sw/source/ui/fldui/fldref.cxx |2 +- 9 files changed, 19 insertions(+), 13 deletions(-) New commits: commit d665e058246631c8a838c3a731bdd0c56be27903 Author: László Németh nem...@numbertext.org Date: Wed Nov 20 07:55:57 2013 +0100 fdo#71645 remove footnote numbers in cross-references Change-Id: Ic3780e4389e450d8c7a69d2f0f2a6a7f81b8906e diff --git a/sw/inc/IDocumentOutlineNodes.hxx b/sw/inc/IDocumentOutlineNodes.hxx index a522cea..f5ec75f 100644 --- a/sw/inc/IDocumentOutlineNodes.hxx +++ b/sw/inc/IDocumentOutlineNodes.hxx @@ -37,7 +37,8 @@ public: virtual int getOutlineLevel( const sal_Int32 nIdx ) const = 0; virtual OUString getOutlineText( const sal_Int32 nIdx, const bool bWithNumber = true, - const bool bWithSpacesForLevel = false ) const = 0; + const bool bWithSpacesForLevel = false, + const bool bWithFtn = true ) const = 0; virtual SwTxtNode* getOutlineNode( const sal_Int32 nIdx ) const = 0; virtual void getOutlineNodes( IDocumentOutlineNodes::tSortedOutlineNodeList orOutlineNodeList ) const = 0; diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 378c6b5..5898077 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -993,7 +993,8 @@ public: virtual int getOutlineLevel( const sal_Int32 nIdx ) const; virtual OUString getOutlineText( const sal_Int32 nIdx, const bool bWithNumber, - const bool bWithSpacesForLevel ) const; + const bool bWithSpacesForLevel, + const bool bWithFtn ) const; virtual SwTxtNode* getOutlineNode( const sal_Int32 nIdx ) const; virtual void getOutlineNodes( IDocumentOutlineNodes::tSortedOutlineNodeList orOutlineNodeList ) const; diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx index d8b23ff..d8e1fbb 100644 --- a/sw/inc/ndtxt.hxx +++ b/sw/inc/ndtxt.hxx @@ -682,7 +682,8 @@ public: const sal_Int32 nLen = -1, const bool bWithNum = false, const bool bAddSpaceAfterListLabelStr = false, -const bool bWithSpacesForLevel = false ) const; +const bool bWithSpacesForLevel = false, +const bool bWithFtn = true ) const; bool GetExpandTxt( SwTxtNode rDestNd, const SwIndex* pDestIdx = 0, sal_Int32 nIdx = 0, sal_Int32 nLen = -1, bool bWithNum = false, bool bWithFtn = true, diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx index 256e308..8e54aa9 100644 --- a/sw/source/core/doc/docnum.cxx +++ b/sw/source/core/doc/docnum.cxx @@ -2422,11 +2422,12 @@ int SwDoc::getOutlineLevel( const sal_Int32 nIdx ) const OUString SwDoc::getOutlineText( const sal_Int32 nIdx, const bool bWithNumber, - const bool bWithSpacesForLevel ) const + const bool bWithSpacesForLevel, + const bool bWithFtn ) const { return GetNodes().GetOutLineNds()[ static_castsal_uInt16(nIdx) ]- GetTxtNode()-GetExpandTxt( 0, -1, bWithNumber, -bWithNumber, bWithSpacesForLevel ); +bWithNumber, bWithSpacesForLevel, bWithFtn ); } SwTxtNode* SwDoc::getOutlineNode( const sal_Int32 nIdx ) const diff --git a/sw/source/core/fields/chpfld.cxx b/sw/source/core/fields/chpfld.cxx index 139b321..b878ccd 100644 --- a/sw/source/core/fields/chpfld.cxx +++ b/sw/source/core/fields/chpfld.cxx @@ -213,7 +213,7 @@ void SwChapterField::ChangeExpansion(const SwTxtNode rTxtNd, sal_Bool bSrchNum) sNumber = ??; } -sTitle = removeControlChars(pTxtNd-GetExpandTxt()); +sTitle = removeControlChars(pTxtNd-GetExpandTxt(0, -1, false, false, false, false)); } } diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx index d9c03a3..96de783 100644 --- a/sw/source/core/fields/reffld.cxx +++ b/sw/source/core/fields/reffld.cxx @@ -248,7 +248,7 @@ OUString SwGetRefField::GetExpandedTxtOfReferencedTxtNode() const { const SwTxtNode* pReferencedTxtNode( GetReferencedTxtNode() ); return
[Libreoffice-qa] General release organization meeting
Hi all, In order to try to have the best organization for the release of 4.2.0 that will happen in February, I would like to organize a meeting between all the projects concerned to make sure we don't forget anything or miss some deadlines and coordinate well together. It would be good to have this meeting during RC1 period (16 to 22 of December) so we have still some time left before the final release. I've set a Doodle here : http://doodle.com/sqkyaaeb5aaigarq We will use the marketing channel on IRC and it would be really great if we could have people representative from : - design team - marketing team - QA team - localization team - native language team and members who administrate website in their language - developer team - documentation team, I'm not sure this team is really concerned but feel free to join :) If I miss somebody don't hesitate to tell me :) And please follow up the discussion on the *marketing list*. I will provide an agenda of the meeting on the wiki next week, where you'll be able to add the points you want us to discuss. I would like to keep it short for all teams and we will do another meeting if one team feels it's necessary. Thanks all in advance for your participation! Kind regards Sophie ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] QA-event ??
Le 18/11/2013 22:32, Cor Nouws a écrit : Sophie wrote (17-11-13 19:23) May be we could include the manual tests I'm preparing for the beta too? Yes, good idea! (And great to read that you are working on this :) ) Ok, so I'll create the page today to prepare the bug hunting session for beta 2 (from 2 to 8 of December), then we will ask for publicity :) I'm still battling with some update for test cases on Moztrap but as soon as I understand what I do wrong, I'll send the link here for some review of what I've done. Cheers Sophie -- Sophie Gautier sophie.gaut...@documentfoundation.org Tel:+33683901545 Membership Certification Committee Member - Co-founder The Document Foundation ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] Moztrap: some feedback please :)
Hi all, So I managed to have the test run for beta2 playing on Moztrap :) Can one of you have a look and give me some feedback on what tests could be missing, what need more regressions tests, etc.? You need to register to run the tests. You can play with it as you want, I'll delete the current run to have a clean run for beta2, so don't hesitate to visit what you want. the link to moztrap http://manual-test.libreoffice.org/runtests/ the link to the documentation: https://wiki.documentfoundation.org/MozTrap/User_Guide Thanks! Sophie -- Sophie Gautier sophie.gaut...@documentfoundation.org Tel:+33683901545 Membership Certification Committee Member - Co-founder The Document Foundation ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] QA-event ??
Hi Sophie, Am 19.11.2013 16:57, schrieb Sophie: Le 18/11/2013 22:32, Cor Nouws a écrit : Sophie wrote (17-11-13 19:23) May be we could include the manual tests I'm preparing for the beta too? Yes, good idea! (And great to read that you are working on this :) ) Page is created: https://wiki.documentfoundation.org/BugHunting_Session_4.2.0 feel free to add what you think I miss or change that you find wrong. I'll add the bug hunting pic when I'll find it again :) E.g.: https://wiki.documentfoundation.org/File:Bughuntbanner_2-wide.png https://wiki.documentfoundation.org/File:BugHunting.png -- Grüße k-j ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] QA-event ??
Am 19.11.2013 17:10, schrieb klaus-jürgen weghorn ol: E.g.: https://wiki.documentfoundation.org/File:Bughuntbanner_2-wide.png https://wiki.documentfoundation.org/File:BugHunting.png And if you need a svg: https://wiki.documentfoundation.org/File:Bughuntbanner.svg -- Grüße k-j ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] QA-event ??
Hi Klaus-Jürgen, Le 19/11/2013 17:13, klaus-jürgen weghorn ol a écrit : Am 19.11.2013 17:10, schrieb klaus-jürgen weghorn ol: E.g.: https://wiki.documentfoundation.org/File:Bughuntbanner_2-wide.png https://wiki.documentfoundation.org/File:BugHunting.png And if you need a svg: https://wiki.documentfoundation.org/File:Bughuntbanner.svg Great, thanks a lot :) Cheers, Sophie ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Moztrap: some feedback please :)
Hi Sophie The basic tests are working as expected. The part where most regressions have sneaked in (and IMO TDF is not worried enough about this) is the MS XML open and save formats. MS based XML files (docx, xlsx, pptx) don't look the same in MS Office and LO (in a pptx I received there are even differences from 4.1 to 4.2) and after making changes and saving again as MS XML sometimes the file is unreadable by MS Office. I know that LO's recommended format is ODF but in the real world you can't refuse MS XML documents. Just my 2 cents. Regards, Pedro -- View this message in context: http://nabble.documentfoundation.org/Libreoffice-qa-Moztrap-some-feedback-please-tp4083995p4084001.html Sent from the QA mailing list archive at Nabble.com. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Moztrap: some feedback please :)
Le 19/11/2013 17:39, Pedro a écrit : Hi Sophie The basic tests are working as expected. The part where most regressions have sneaked in (and IMO TDF is not worried enough about this) is the MS XML open and save formats. yes, it's still on my todo. MS based XML files (docx, xlsx, pptx) don't look the same in MS Office and LO (in a pptx I received there are even differences from 4.1 to 4.2) and after making changes and saving again as MS XML sometimes the file is unreadable by MS Office. I know that LO's recommended format is ODF but in the real world you can't refuse MS XML documents. ok, I'll grep the most important I can find in BZ, I know about some page numbering, pictures placement etc. issues. I don't have Office to test but that shouldn't prevent me to write tests. Thanks a lot for your feedback :) Cheers Sophie ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Moztrap: some feedback please :)
Hello Sophie, *, On Dienstag, 19. November 2013 16:34 Sophie wrote: So I managed to have the test run for beta2 playing on Moztrap :) great, thank you very much :) Can one of you have a look and give me some feedback on what tests could be missing, what need more regressions tests, etc.? You need to register to run the tests. You can play with it as you want, I'll delete the current run to have a clean run for beta2, so don't hesitate to visit what you want. I have reached Test Case #11 (there is a link to http://manual-test.libreoffice.org/manage/caseversion/772/), where I found the following: quote Environment Settings Download the test document from attachment: language- test-{language}.odt /quote . But on that test there are only test documents attached for En and FR so far ... :( Do you plan to add test documents for other languages as well? And in the test description there is quote Linux For spell check, install a myspell-{language} package For grammar check, install a libreoffice-languagetool-{language} package For example: English language: myspell-british, myspell-american, libreoffice-language-en French language: myspell-french, libreoffice-language-fr German language: myspell-german, libreoffice-language-de /quote . If I see this correctly, LO is using hunspell nowadays (look at Tools – Options – Language Settings – Writing Aids. Below Available language modules is the entry Hunspell SpellChecker, and if I am not completely wrong here, that means, LO is using its internal Hunspell SpellChecker ... ;) ). And LanguageTool is either an Extension for LO or a different package (see www.languagetool.org) ... ;) The only grammar checker in LO is the Lightproof grammar checker, but alas only for the English language ... :( And does this libreoffice-language-$TLD mean, someone should install the adequate langpack? Would it not be better to write something like quote Linux spell-checker: You need to install the langpack for your language for LibreOffice to test the spellchecker. grammar check: You can install the LanguageTool extension from www.languagetool.org, if you want to use a grammar checker for your language. For example: English language: LibreOffice langpack-en_US or en_GB French language: LibreOffice langpack-fr_FR German language: LibreOffice langpack-de_DE /quote or the like? And there is a missing s in mispelt btw. ... ;) And some strange sounding sentences, and libreoffice instead of LibreOffice and (I think, I should better stop, before someone kills me ... ;) ). Maybe I find some time tomorrow to try to rewrite a couple of the test cases (though I would prefer, if an native speaker would do this). Sorry for the inconvenience and HTH Thomas. -- NP: Anthrax – War Is on My Head ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Existing German translation in Moztrap
Hi *, The repo is here (silently), may be I should make it available for @tdf searching :) https://github.com/yifanjiang/moztrap The important hacking on this branch is OpenID login implementation. As for the localization, IMHO, is inevitably considered divided into 2 levels: 1. the UI level The content is relatively static in moztrap *code*, usually *translated* word by word. Yes, with Django framework, it is not that complicated to leverage pootle approach to translate the UI of Moztrap, where UI indicates any text else except test cases content in Moztrap. But, I doubt it is really necessary to implement and MAINTAIN this even if the word-by-word translation has been highly automated: http://translate.google.com/translate?hl=ensl=entl=deu=http://manual-test.libreoffice.org/results/runs/ 2. the test case level The content is relatively dynamic in moztrap *database*, usually *localized* sentence by setence or paragraphs by paragraphs. The similar way of UI level translation does make sense in the first place, however *database* level translation is not that easy as what we did in *code* level in a Django framwork. It may be needed to deeply reconstruct the moztrap core tables, and hook together pootle like translation content with the refined moztrap database. In another word, yes, technically it can be more complicated :) Best wishes, Yifan On Thu, Nov 14, 2013 at 09:20:32AM +0100, Thomas Hackert wrote: Hello Robinson, *, On Donnerstag, 14. November 2013 08:59 Robinson Tryon wrote: On Thu, Nov 14, 2013 at 2:50 AM, Thomas Hackert thack...@nexgo.de wrote: At least the first part (localizing the interface) seems like it just needs someone to go poke at the code for a while (no, I'm not raising my hand right now... :-) I cannot help here as well, sorry ... :( If I read the above side right, it is just some kind of Python hook. But how do I see, if localization is enabled in our Django installation? I don't see a TDF fork of moztrap up on Github: https://github.com/search?q=%40tdf++moztrap there is no Django fork there as well (https://github.com/search?q=%40tdf++django) ... :( Maybe the repo lives elsewhere? Maybe. But I am not one of our admins, so ... ;) And I found on https://docs.djangoproject.com/en/1.6/internals/contributing/localizing/, that the project uses transiflex (https://www.transifex.com/) itself to translate their software. Does it mean, we have to switch to transiflex as well? I think that's just what django uses for their own work. I think that lots of tools support the .po file format, so we can stick with whatever system we currently have in place (pootle, IIRC). That would be nice :) Thomas. -- Yifan Jiang SUSE Desktop, Libreoffice /SUSE Contact: yifan - irc.freenode.net/libreoffice = http://www.libreoffice.org/ http://www.documentfoundation.org/ ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Existing German translation in Moztrap
Good morning Yifan, On Dienstag, 19. November 2013 20:41 Yifan Jiang wrote: The repo is here (silently), may be I should make it available for @tdf searching :) maybe ... ;) https://github.com/yifanjiang/moztrap The important hacking on this branch is OpenID login implementation. I am not a dev, so I cannot be of any help here, sorry ... :( As for the localization, IMHO, is inevitably considered divided into 2 levels: 1. the UI level The content is relatively static in moztrap *code*, usually *translated* word by word. What does code in this context mean? I need to use a programming language like C++, JS, or something else? Yes, with Django framework, it is not that complicated to leverage pootle approach to translate the UI of Moztrap, where UI indicates any text else except test cases content in Moztrap. And that would mean, I need an account to look at TDF's implementation of Django? But, I doubt it is really necessary to implement and MAINTAIN this even if the word-by-word translation has been highly automated: http://translate.google.com/translate?hl=ensl=entl=deu=http://manual-test.libreoffice.org/results/runs/ Ah, O.K. Now I know, why some of the test cases sound strange ... ;) In my experience, translation engines are good to get a short overview, what is inside a text. But they loose, if you want a reliable translation ... :( 2. the test case level The content is relatively dynamic in moztrap *database*, usually *localized* sentence by setence or paragraphs by paragraphs. The similar way of UI level translation does make sense in the first place, however *database* level translation is not that easy as what we did in *code* level in a Django framwork. It may be needed to deeply reconstruct the moztrap core tables, and hook together pootle like translation content with the refined moztrap database. If we could translate it via Pootle, then it would ease the work for us translators ... ;) How difficult would it be to implement it? In another word, yes, technically it can be more complicated :) Well ... ;) Thank you for your answer Thomas. TOFU removed -- Moderation in all things. -- Publius Terentius Afer [Terence] ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 71521] FILESAVE: File locking is broken
https://bugs.freedesktop.org/show_bug.cgi?id=71521 --- Comment #6 from chebmas...@mail.ru --- For now, the bug has disappeared (after hibernating and waking up), so I would not be able to tell if resetting the profile worked. I also don't have any old lock files. If it acts up again, I'll definitely try it and report here. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 71775] New: VIEWING: hang when switching window
https://bugs.freedesktop.org/show_bug.cgi?id=71775 Priority: medium Bug ID: 71775 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: VIEWING: hang when switching window Severity: critical Classification: Unclassified OS: Windows (All) Reporter: ulrich.wi...@rz.uni-regensburg.de Hardware: x86 (IA32) Status: UNCONFIRMED Version: 4.1.3.2 release Component: Writer Product: LibreOffice (This report may be related to bug 65076 or bug 64541) I had two windows for the same document open. I changed the zoom for one window. When I switched to the other window (which was possibly at the end of the document, showing an index), the windows switched from left page view to right page view in a never-ending loop, and I could not do anything. Not even the close window events were processed. I had to kill Writer through the task manager. The document had tables, images, cross-references, index entries, and all the stuff a document has... (just in case you ask) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 71121] VIEWING: Opening xlsx file brings empty cells
https://bugs.freedesktop.org/show_bug.cgi?id=71121 --- Comment #4 from Mirza mirza.dervise...@gmail.com --- If this gets fixed in development version or something, please notify me by updating this bug report, as I am using LibreOffice at my office and this is causing me problems. Also if there is anything else that I can contribute testing or something please just say. Thank you for your efforts. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 35726] [FILEOPEN] odt file created by Abiword reported as corrupt
https://bugs.freedesktop.org/show_bug.cgi?id=35726 --- Comment #22 from Bob Harvey bobhar...@europe.com --- I just installed 4.1.3 and opened all the examples from this report without error messages. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 71459] No easy way to subtract two numbers (without snap-to-zero)
https://bugs.freedesktop.org/show_bug.cgi?id=71459 --- Comment #7 from Dominique Boutry dominique.bout...@laposte.net --- OK, I accept the lesson on how to compute COMBIN... -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 71121] VIEWING: Opening xlsx file brings empty cells
https://bugs.freedesktop.org/show_bug.cgi?id=71121 Mirza mirza.dervise...@gmail.com changed: What|Removed |Added Hardware|Other |x86-64 (AMD64) OS|All |Windows (All) Version|3.6.7.2 release |4.1.2.3 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 48462] PDF as a graphical image
https://bugs.freedesktop.org/show_bug.cgi?id=48462 --- Comment #2 from Bob Harvey bobhar...@europe.com --- In version 4 I have been able to open multi-page PDFs in Draw, and lock the layer they are opened on, then annotate them on another layer. So that is a useful improvement in my work flow. But I would still like to be able to open them as a pure graphic, and in other parts of the package. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 71319] Incorrect wrapping of text with indent around a picture
https://bugs.freedesktop.org/show_bug.cgi?id=71319 --- Comment #5 from Dominique Boutry dominique.bout...@laposte.net --- I agree. I used tables in the past to get a specific layout in a book I wrote ; however I agree it isn't a general solution. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 71776] New: FORMATTING: Data Sorting not accurate
https://bugs.freedesktop.org/show_bug.cgi?id=71776 Priority: medium Bug ID: 71776 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: FORMATTING: Data Sorting not accurate Severity: normal Classification: Unclassified OS: Windows (All) Reporter: ashley.croo...@gmail.com Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.1.3.2 release Component: Spreadsheet Product: LibreOffice Created attachment 89452 -- https://bugs.freedesktop.org/attachment.cgi?id=89452action=edit A list of animal numbers which is checked when vaccinating etc Problem description: I'm using Calc to enter numbers and then trying to sort the the column in Ascending order. If you look at the attached file, you will notice that not all the numbers are in sequence and it's frustrating trying to run through the list when the numbers are all over the place ie 1040 is near the top of the sheet yet 1041 is right near the bottom? Any help with this would be greatly appreciated. Thanks Ashley Crookes Operating System: Windows 7 Version: 4.1.3.2 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 59508] Unable to modify paths (on Fedora 17 18)
https://bugs.freedesktop.org/show_bug.cgi?id=59508 Urmas davian...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |NOTOURBUG -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68865] Installation of new Libreoffice 4-1.0.5, get message Libreoffice 4-1.0.5_M not recognized.
https://bugs.freedesktop.org/show_bug.cgi?id=68865 --- Comment #3 from Foss f...@openmailbox.org --- Perfect. Also update notices should already have tremendously improved oer the last few versions. So in the future you can use the intern update check to be notified about newer versions. If you reply, please do via your browser (not mail) since otherwise this bug tracker will be cluttered too much. Thanks :) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 71749] LO cannot open a word document with a table inside a footnote (and crashes)
https://bugs.freedesktop.org/show_bug.cgi?id=71749 Urmas davian...@gmail.com changed: What|Removed |Added Status|NEEDINFO|NEW --- Comment #3 from Urmas davian...@gmail.com --- Libreoffice loops while opening such files. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 71749] LO cannot open a word document with a table inside a footnote (and crashes)
https://bugs.freedesktop.org/show_bug.cgi?id=71749 Urmas davian...@gmail.com changed: What|Removed |Added Attachment #89416|0 |1 is obsolete|| --- Comment #2 from Urmas davian...@gmail.com --- Created attachment 89454 -- https://bugs.freedesktop.org/attachment.cgi?id=89454action=edit Example -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 61272] Incorrect EMF pictures visualization
https://bugs.freedesktop.org/show_bug.cgi?id=61272 --- Comment #8 from Owen Genat owen.ge...@gmail.com --- (In reply to comment #7) No offence but: 1. I didn't change the importance but questioned it I know. I did not mean to imply you had, so I am sorry if it sounded that way. I was just trying to provide some clarity. So tell me: what should a Windows user do, when he owns an EMF and wants to include it into a LibO-Writer document without loosing informations or if he wants to copy/paste from PowerPoint to LibO-Writer and not a single paste-format (CTRL+Shift+V) brings up a correct representation? EMF+ support is steadily improving (http://opengrok.libreoffice.org/history/core/cppcanvas/source/mtfrenderer/emfplus.cxx), but you will need patience. There are numerous EMF-related bugs, including this one. Simply because MS has billions and are unwilling to improve open format support, does not mean that those working on a largely volunteer basis are somehow obligated to see supporting MS formats as critical. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 64001] COUNTIF does not count TRUEs created with autofill correctly
https://bugs.freedesktop.org/show_bug.cgi?id=64001 --- Comment #6 from Owen Genat owen.ge...@gmail.com --- (In reply to comment #5) Should this report be set as enhancement request? Or perhaps even closed? I think it could be closed as WONTFIX, but it would be good to hear from the original reporter. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 62884] EDITING: Page jumps to show whole picture
https://bugs.freedesktop.org/show_bug.cgi?id=62884 --- Comment #2 from Dominique Boutry dominique.bout...@laposte.net --- I tried many settings combinations (image size/anchor, smooth scrolling, ...) : not reproduced with LibO 4.1.2.3 on Win7. The 1-2 secs delay let me think to a problem on a background process which could be used in desplaying, if any. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs