[Libreoffice-commits] .: setup_native/source solenv/bin
setup_native/source/packinfo/spellchecker_selection.txt |1 + solenv/bin/modules/installer/worker.pm |2 +- 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit 030c4269cb14ed429e4a1f0314eba7a783816ac1 Author: Petr Mladek pmla...@suse.cz Date: Thu Apr 12 09:45:32 2012 +0200 pack en dictionary only with en langpacks it is in the main installation tarball anyway; it was put in langpacks that did not have its own dictionary from some strange reason diff --git a/setup_native/source/packinfo/spellchecker_selection.txt b/setup_native/source/packinfo/spellchecker_selection.txt index 8a866a2..a2e10bb 100644 --- a/setup_native/source/packinfo/spellchecker_selection.txt +++ b/setup_native/source/packinfo/spellchecker_selection.txt @@ -21,6 +21,7 @@ de = de,fr,it el = el en-US = en,es,fr en-GB = en,es,fr +en-ZA = en,es,fr es = an,es,fr,pt et = et fr = fr,es diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm index dd0c339..bd740a7 100644 --- a/solenv/bin/modules/installer/worker.pm +++ b/solenv/bin/modules/installer/worker.pm @@ -2438,7 +2438,7 @@ sub set_spellcheckerlanguages { my $languagelist = ; if ( exists($spellcheckhash{$lang}) ) { $languagelist = $spellcheckhash{$lang}; } -else { $languagelist = $spellcheckhash{'en-US'}; } # defaulting to English +else { $languagelist = ; } # no dictionary unless defined in SPELLCHECKERFILE my $langlisthash = installer::converter::convert_stringlist_into_hash(\$languagelist, ,); foreach my $onelang ( keys %{$langlisthash} ) { $installer::globals::spellcheckerlanguagehash{$onelang} = 1; } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: canvas/source
canvas/source/cairo/cairo_canvashelper.cxx |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) New commits: commit f0a5e147eb9ae4a343f51eda20126488347e66f8 Author: Radek Doulik r...@novell.com Date: Thu Apr 12 10:07:03 2012 +0200 add .5 to control points coordinates after transformation - otherwise we might end up with wrong coordinates - fixes fdo#38580 diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx index c04ac93..b75efda 100644 --- a/canvas/source/cairo/cairo_canvashelper.cxx +++ b/canvas/source/cairo/cairo_canvashelper.cxx @@ -1024,6 +1024,9 @@ namespace cairocanvas nBX = aB.getX(); nBY = aB.getY(); +cairo_matrix_transform_point( aOrigMatrix, nAX, nAY ); +cairo_matrix_transform_point( aOrigMatrix, nBX, nBY ); + if( aOperation == Stroke ) { nAX += 0.5; @@ -1031,8 +1034,7 @@ namespace cairocanvas nBX += 0.5; nBY += 0.5; } -cairo_matrix_transform_point( aOrigMatrix, nAX, nAY ); -cairo_matrix_transform_point( aOrigMatrix, nBX, nBY ); + cairo_curve_to( pCairo, nAX, nAY, nBX, nBY, nX, nY ); } else ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - connectivity/source i18npool/qa i18npool/source oox/inc oox/source sc/source slideshow/source svtools/inc svtools/source unusedcode.easy
connectivity/source/commontools/dbexception.cxx |4 i18npool/qa/cppunit/test_breakiterator.cxx | 73 ++--- i18npool/source/breakiterator/data/char.txt |7 - i18npool/source/breakiterator/data/char_in.txt |7 - oox/inc/oox/dump/dumperbase.hxx |8 - oox/source/dump/dumperbase.cxx | 28 -- sc/source/filter/oox/workbookhelper.cxx |8 - slideshow/source/engine/animationnodes/basenode.cxx |8 - slideshow/source/engine/animationnodes/basenode.hxx |1 svtools/inc/svtools/scrwin.hxx |1 svtools/source/control/scrwin.cxx | 83 unusedcode.easy | 10 +- 12 files changed, 74 insertions(+), 164 deletions(-) New commits: commit be3ee9c889f4240848a3f232f2b3009ea647fefc Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 12 09:45:52 2012 +0100 callcatcher: update unused code list diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx index b4e862f..37fbb2a 100644 --- a/connectivity/source/commontools/dbexception.cxx +++ b/connectivity/source/commontools/dbexception.cxx @@ -437,11 +437,9 @@ void throwFunctionNotSupportedException( const sal_Char* _pAsciiFunctionName, co STR_UNSUPPORTED_FUNCTION, $functionname$, ::rtl::OUString::createFromAscii( _pAsciiFunctionName ) ) ); -throw SQLException( +throwFunctionNotSupportedException( sError, _rxContext, -getStandardSQLState( SQL_FUNCTION_NOT_SUPPORTED ), -0, _pNextException ? *_pNextException : Any() ); } diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx index 10b1e11..10995ef 100644 --- a/oox/inc/oox/dump/dumperbase.hxx +++ b/oox/inc/oox/dump/dumperbase.hxx @@ -380,9 +380,6 @@ public: static void appendAddrName( ::rtl::OUStringBuffer rStr, sal_Unicode cPrefix, sal_Int32 nColRow, bool bRel ); static void appendAddress( ::rtl::OUStringBuffer rStr, const Address rPos ); -static void appendRange( ::rtl::OUStringBuffer rStr, const Range rRange ); - -static void appendAddress( ::rtl::OUStringBuffer rStr, const TokenAddress rPos, bool bR1C1 ); // encoded text output @@ -1848,11 +1845,6 @@ protected: const ::rtl::OUString rSysFileName, const String rRecNames, const String rSimpleRecs = EMPTY_STRING ); -voidconstruct( -const OutputObjectBase rParent, -const BinaryInputStreamRef rxBaseStrm, -const String rRecNames, -const String rSimpleRecs = EMPTY_STRING ); virtual boolimplStartRecord( BinaryInputStream rBaseStrm, sal_Int64 ornRecPos, sal_Int64 ornRecId, sal_Int64 ornRecSize ); virtual boolimplReadRecordHeader( BinaryInputStream rBaseStrm, sal_Int64 ornRecId, sal_Int64 ornRecSize ) = 0; diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx index 62a6d4c..d7cc27d 100644 --- a/oox/source/dump/dumperbase.cxx +++ b/oox/source/dump/dumperbase.cxx @@ -504,27 +504,6 @@ void StringHelper::appendAddress( OUStringBuffer rStr, const Address rPos ) appendAddrRow( rStr, rPos.mnRow, true ); } -void StringHelper::appendRange( OUStringBuffer rStr, const Range rRange ) -{ -appendAddress( rStr, rRange.maFirst ); -rStr.append( OOX_DUMP_RANGESEP ); -appendAddress( rStr, rRange.maLast ); -} - -void StringHelper::appendAddress( OUStringBuffer rStr, const TokenAddress rPos, bool bR1C1 ) -{ -if( bR1C1 (rPos.mbRelCol || rPos.mbRelRow) ) -{ -appendAddrName( rStr, OOX_DUMP_R1C1ROW, rPos.mnRow, rPos.mbRelRow ); -appendAddrName( rStr, OOX_DUMP_R1C1COL, rPos.mnCol, rPos.mbRelCol ); -} -else -{ -appendAddrCol( rStr, rPos.mnCol, rPos.mbRelCol ); -appendAddrRow( rStr, rPos.mnRow, rPos.mbRelRow ); -} -} - // encoded text output void StringHelper::appendCChar( OUStringBuffer rStr, sal_Unicode cChar, bool bPrefix ) @@ -2695,13 +2674,6 @@ void SequenceRecordObjectBase::construct( const ObjectBase rParent, RecordObjectBase::construct( rParent, rxBaseStrm, rSysFileName, xRecStrm, rRecNames, rSimpleRecs ); } -void SequenceRecordObjectBase::construct( const OutputObjectBase rParent, -const BinaryInputStreamRef rxBaseStrm, const String rRecNames, const String rSimpleRecs ) -{ -BinaryInputStreamRef xRecStrm( new SequenceInputStream( *mxRecData ) ); -RecordObjectBase::construct( rParent, rxBaseStrm, xRecStrm, rRecNames, rSimpleRecs ); -} - bool
[Libreoffice-commits] .: binfilter/bf_sd binfilter/bf_svtools binfilter/inc binfilter/prj
binfilter/bf_sd/source/filter/xml/makefile.mk | 52 -- binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx | 396 - binfilter/bf_sd/source/ui/docshell/sd_docshell.cxx |2 binfilter/bf_sd/util/makefile.mk |1 binfilter/bf_svtools/source/misc/tl_strimp.cxx | 13 binfilter/bf_svtools/source/misc/tl_tustring.cxx | 13 binfilter/inc/bf_sd/sdxmlwrp.hxx | 62 --- binfilter/inc/bf_tools/string.hxx |5 binfilter/prj/build.lst|3 9 files changed, 17 insertions(+), 530 deletions(-) New commits: commit 4aef5125781f62138c63829b5d0c6f28d870671a Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 12 09:36:20 2012 +0100 ditch some unnecessary code diff --git a/binfilter/bf_sd/source/filter/xml/makefile.mk b/binfilter/bf_sd/source/filter/xml/makefile.mk deleted file mode 100644 index 4073338..000 --- a/binfilter/bf_sd/source/filter/xml/makefile.mk +++ /dev/null @@ -1,52 +0,0 @@ -#* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# http://www.openoffice.org/license.html -# for a copy of the LGPLv3 License. -# -#* - -PRJ=..$/..$/..$/.. -BFPRJ=..$/..$/.. - -PRJNAME=binfilter -TARGET=sd_xml - -NO_HIDS=TRUE - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings - - -.INCLUDE : settings.mk -.INCLUDE : $(BFPRJ)$/util$/makefile.pmk -INC+= -I$(PRJ)$/inc$/bf_sd - -# --- Files - -SLOFILES = \ -$(SLO)$/sd_sdxmlwrp.obj - -# --- Targets -- - -.INCLUDE : target.mk - diff --git a/binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx b/binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx deleted file mode 100644 index 2e328ce..000 --- a/binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx +++ /dev/null @@ -1,396 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * http://www.openoffice.org/license.html - * for a copy of the LGPLv3 License. - * - / - -#include rtl/logfile.hxx -#include rtl/strbuf.hxx - -#include com/sun/star/xml/sax/SAXParseException.hdl -#include bf_sfx2/docfile.hxx -#include drawdoc.hxx -#include unotools/streamwrap.hxx -#include bf_svx/xmlgrhlp.hxx - -#include bf_sd/docshell.hxx -#include sdxmlwrp.hxx -#include strmname.h - -#include bf_svx/xmleohlp.hxx - -#include bf_sfx2/appuno.hxx - -#include com/sun/star/document/XFilter.hpp -#include com/sun/star/document/XImporter.hpp -#include com/sun/star/document/XExporter.hpp -#include com/sun/star/beans/PropertyAttribute.hpp -#include com/sun/star/packages/zip/ZipIOException.hpp - -#include com/sun/star/xml/sax/XParser.hpp -#include com/sun/star/io/XActiveDataSource.hpp - -#include comphelper/genericpropertyset.hxx - -#include bf_svtools/saveopt.hxx - -// #80365#
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - setup_native/source solenv/bin
setup_native/source/packinfo/spellchecker_selection.txt |1 + solenv/bin/modules/installer/worker.pm |2 +- 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit 78c43c0b9963038f3b23980ae0eea3a6128c412c Author: Petr Mladek pmla...@suse.cz Date: Thu Apr 12 09:45:32 2012 +0200 pack en dictionary only with en langpacks it is in the main installation tarball anyway; it was put in langpacks that did not have its own dictionary from some strange reason Signed-off-by: Tomáš Chvátal tchva...@suse.cz diff --git a/setup_native/source/packinfo/spellchecker_selection.txt b/setup_native/source/packinfo/spellchecker_selection.txt index 8a866a2..a2e10bb 100644 --- a/setup_native/source/packinfo/spellchecker_selection.txt +++ b/setup_native/source/packinfo/spellchecker_selection.txt @@ -21,6 +21,7 @@ de = de,fr,it el = el en-US = en,es,fr en-GB = en,es,fr +en-ZA = en,es,fr es = an,es,fr,pt et = et fr = fr,es diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm index a7da80f..83c8cd8 100644 --- a/solenv/bin/modules/installer/worker.pm +++ b/solenv/bin/modules/installer/worker.pm @@ -2811,7 +2811,7 @@ sub set_spellcheckerlanguages { my $languagelist = ; if ( exists($spellcheckhash{$lang}) ) { $languagelist = $spellcheckhash{$lang}; } -else { $languagelist = $spellcheckhash{'en-US'}; } # defaulting to English +else { $languagelist = ; } # no dictionary unless defined in SPELLCHECKERFILE my $langlisthash = installer::converter::convert_stringlist_into_hash(\$languagelist, ,); foreach my $onelang ( keys %{$langlisthash} ) { $installer::globals::spellcheckerlanguagehash{$onelang} = 1; } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: setup_native/source
setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cfa4c9c11538b332234709dedc7ca553a10ab08e Author: Andras Timar ati...@suse.com Date: Thu Apr 12 08:55:45 2012 +0200 typo fix in comment diff --git a/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx b/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx index fce807f..c1319e2 100644 --- a/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx +++ b/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx @@ -101,7 +101,7 @@ extern C UINT __stdcall IsOfficeRunning( MSIHANDLE handle ) if ( sOfficeInstallPath.length() == 0 ) return ERROR_SUCCESS; -DWORD aProcesses[1024], cbNeeded, cProcesses; /* 1024 processses ought to be enough for anybody */ +DWORD aProcesses[1024], cbNeeded, cProcesses; /* 1024 processes ought to be enough for anybody */ if ( !EnumProcesses( aProcesses, sizeof(aProcesses), cbNeeded ) ) return ERROR_INSTALL_FAILURE; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 5 commits - framework/inc framework/source offapi/com offapi/UnoApi_offapi.mk oox/inc oox/Library_oox.mk oox/Package_inc.mk oox/source qadevOOo/Jar_OOoRunner.mk qadevOOo/objds
framework/inc/services/layoutmanager.hxx | 12 - framework/source/layoutmanager/layoutmanager.cxx | 14 - offapi/UnoApi_offapi.mk |1 offapi/com/sun/star/frame/LayoutManager.idl |7 offapi/com/sun/star/frame/XInplaceLayout.idl | 68 - oox/Library_oox.mk|1 oox/Package_inc.mk|1 oox/inc/oox/core/binaryfilterbase.hxx | 65 - oox/inc/oox/core/filterbase.hxx | 17 -- oox/source/core/binaryfilterbase.cxx | 72 -- oox/source/core/filterbase.cxx| 13 - qadevOOo/Jar_OOoRunner.mk |1 qadevOOo/objdsc/fwk/com.sun.star.comp.framework.LayoutManager.csv |2 qadevOOo/tests/java/ifc/frame/_XInplaceLayout.java| 48 -- sc/source/filter/inc/excelfilter.hxx |1 sc/source/filter/inc/workbookhelper.hxx |1 sc/source/filter/oox/workbookhelper.cxx |5 sd/source/filter/ppt/pptin.cxx|2 unusedcode.easy |3 19 files changed, 3 insertions(+), 331 deletions(-) New commits: commit 032439617e4c82980d909dd09e10a47471d70aec Author: Thomas Arnhold tho...@arnhold.org Date: Thu Apr 12 11:15:14 2012 +0200 unusedcode.easy: remove FilterBase::openSubStorage diff --git a/oox/inc/oox/core/filterbase.hxx b/oox/inc/oox/core/filterbase.hxx index 709b386..a4607e2 100644 --- a/oox/inc/oox/core/filterbase.hxx +++ b/oox/inc/oox/core/filterbase.hxx @@ -161,18 +161,6 @@ public: /** Returns the base storage of the imported/exported file. */ StorageRef getStorage() const; -/** Opens and returns the specified sub storage from the base storage. - -@param rStorageName -The name of the embedded storage. The name may contain slashes to -open storages from embedded substorages. -@param bCreateMissing -True = create missing sub storages (for export filters). - */ -StorageRef openSubStorage( -const ::rtl::OUString rStorageName, -bool bCreateMissing ) const; - /** Opens and returns the specified input stream from the base storage. @param rStreamName diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx index ce4fe3d..97f298d 100644 --- a/oox/source/core/filterbase.cxx +++ b/oox/source/core/filterbase.cxx @@ -363,11 +363,6 @@ StorageRef FilterBase::getStorage() const return mxImpl-mxStorage; } -StorageRef FilterBase::openSubStorage( const OUString rStorageName, bool bCreateMissing ) const -{ -return mxImpl-mxStorage-openSubStorage( rStorageName, bCreateMissing ); -} - Reference XInputStream FilterBase::openInputStream( const OUString rStreamName ) const { return mxImpl-mxStorage-openInputStream( rStreamName ); diff --git a/unusedcode.easy b/unusedcode.easy index 5b1ce0f..c619945 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -760,7 +760,6 @@ nullcanvas::SpriteCanvasHelper::genericUpdate(basegfx::B2DConnectedRangescanvas nullcanvas::SpriteCanvasHelper::opaqueUpdate(basegfx::B2DConnectedRangescanvas::SpriteRedrawManager::SpriteInfo::ConnectedComponents const) nullcanvas::SpriteCanvasHelper::scrollUpdate(basegfx::B2DRange const, basegfx::B2DRange const, basegfx::B2DConnectedRangescanvas::SpriteRedrawManager::SpriteInfo::ConnectedComponents const) oox::PropertyMap::dump(com::sun::star::uno::Referencecom::sun::star::beans::XPropertySet) -oox::core::FilterBase::openSubStorage(rtl::OUString const, bool) const oox::xls::Alignment::setBiff2Data(unsigned char) oox::xls::Alignment::setBiff3Data(unsigned short) oox::xls::Alignment::setBiff4Data(unsigned short) commit 3030a3a52f9bd89a055f65a2c5033be028da3cc2 Author: Thomas Arnhold tho...@arnhold.org Date: Thu Apr 12 11:03:22 2012 +0200 offapi: remove obsolete XInplaceLayout (2nd try) This is related to 10e580c57b907420e8c6d816325445a40a720e4a diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx index e9eea8d..09be601 100644 --- a/framework/inc/services/layoutmanager.hxx +++ b/framework/inc/services/layoutmanager.hxx @@ -67,7 +67,6 @@ #include com/sun/star/awt/XWindowListener.hpp #include com/sun/star/util/XURLTransformer.hpp #include com/sun/star/ui/XUIElementFactory.hpp -#include com/sun/star/frame/XInplaceLayout.hpp #include com/sun/star/ui/DockingArea.hpp #include com/sun/star/awt/XTopWindow2.hpp #include com/sun/star/awt/XDockableWindow.hpp @@ -79,7 +78,7 @@
[Libreoffice-commits] .: svx/source
svx/source/sdr/contact/viewobjectcontactofgraphic.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 03a651507e34ee423674d2a537f2bb4b509af6d6 Author: Muthu Subramanian sumu...@suse.com Date: Thu Apr 12 16:05:23 2012 +0530 n#717947: Fixed pdf export (of images). diff --git a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx index 75581d6..c43d4cf 100644 --- a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx @@ -130,7 +130,7 @@ namespace sdr } else { -if(rObjectContact.isOutputToPrinter()) +if(rObjectContact.isOutputToPrinter() || rObjectContact.isOutputToPDFFile()) { // #i76395# preview mechanism is only active if // swapin is called from inside paint preparation, so mbInsidePaint @@ -182,7 +182,7 @@ namespace sdr { ObjectContact rObjectContact = GetObjectContact(); -if(rObjectContact.isOutputToPrinter()) +if(rObjectContact.isOutputToPrinter() || rObjectContact.isOutputToPDFFile()) { // #i76395# preview mechanism is only active if // swapin is called from inside paint preparation, so mbInsidePaint @@ -195,7 +195,7 @@ namespace sdr rGrafObj.mbInsidePaint = true; rGrafObj.ForceSwapIn(); rGrafObj.mbInsidePaint = false; -} +} bRetval = true; } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - canvas/inc canvas/source editeng/source hwpfilter/source sc/source sd/source svtools/source svx/workben sw/source unusedcode.easy vcl/source
canvas/inc/canvas/elapsedtime.hxx |4 - canvas/source/tools/elapsedtime.cxx |5 -- editeng/source/editeng/editdbg.cxx|2 editeng/source/editeng/editview.cxx |2 editeng/source/editeng/impedit.cxx|2 editeng/source/rtf/svxrtf.cxx |2 hwpfilter/source/grammar.cxx |6 +- sc/source/filter/excel/xlpivot.cxx|5 -- sc/source/filter/inc/xlpivot.hxx |2 sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx |2 sd/source/ui/slidesorter/model/SlsVisualState.cxx | 37 -- svtools/source/edit/textdoc.cxx |8 +-- svtools/source/edit/texteng.cxx |2 svtools/source/edit/textundo.cxx |2 svtools/source/edit/xtextedt.cxx |4 - svtools/source/inc/unoiface.hxx |2 svx/workben/edittest.cxx |2 sw/source/filter/rtf/swparrtf.cxx |2 unusedcode.easy |3 - vcl/source/control/ilstbox.cxx|6 +- 20 files changed, 20 insertions(+), 80 deletions(-) New commits: commit 30fb54aca35c744517ad697f2d299481b02d457f Author: Thomas Arnhold tho...@arnhold.org Date: Thu Apr 12 12:35:21 2012 +0200 remove formfeeds diff --git a/editeng/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx index c1ef702..af2e37f 100644 --- a/editeng/source/editeng/editdbg.cxx +++ b/editeng/source/editeng/editdbg.cxx @@ -429,7 +429,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool bInfoBox ) if ( pEE-pImpEditEngine-GetStyleSheetPool() ) { sal_uLong nStyles = pEE-pImpEditEngine-GetStyleSheetPool() ? pEE-pImpEditEngine-GetStyleSheetPool()-Count() : 0; -fprintf( fp, \n\n ); +fprintf( fp, \n\n ); fprintf( fp, \n== Stylesheets = ); fprintf( fp, \n ); fprintf( fp, \n#Template: %lu\n, nStyles ); diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index 9bf11c0..81f0284 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -162,7 +162,7 @@ LanguageType lcl_CheckLanguage( } -// -- +// -- // class EditView // -- EditView::EditView( EditEngine* pEng, Window* pWindow ) diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index d3268ce..252da7c 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -71,7 +71,7 @@ inline void lcl_AllignToPixel( Point rPoint, OutputDevice* pOutDev, short nDiff rPoint = pOutDev-PixelToLogic( rPoint ); } -// -- +// -- // class ImpEditView // -- ImpEditView::ImpEditView( EditView* pView, EditEngine* pEng, Window* pWindow ) : diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx index 91b68e8..45fd74b 100644 --- a/editeng/source/rtf/svxrtf.cxx +++ b/editeng/source/rtf/svxrtf.cxx @@ -1150,7 +1150,6 @@ const SfxItemSet SvxRTFParser::GetRTFDefaults() return *pRTFDefaults; } -/**/ SvxRTFStyleType::SvxRTFStyleType( SfxItemPool rPool, const sal_uInt16* pWhichRange ) : aAttrSet( rPool, pWhichRange ) @@ -1356,7 +1355,6 @@ void SvxRTFItemStackType::SetRTFDefaults( const SfxItemSet rDefaults ) } } -/**/ RTFPlainAttrMapIds::RTFPlainAttrMapIds( const SfxItemPool rPool ) { diff --git a/hwpfilter/source/grammar.cxx b/hwpfilter/source/grammar.cxx index 99c2f3c..1b76cbb 100644 --- a/hwpfilter/source/grammar.cxx +++ b/hwpfilter/source/grammar.cxx @@ -534,7 +534,7 @@ int yydebug;/* nonzero means print parse trace */ #ifndef YYMAXDEPTH #define YYMAXDEPTH 1 #endif - + /* Define __yy_memcpy. Note that the size argument should be passed with type unsigned int, because that is what the non-GCC definitions require. With GCC, __builtin_memcpy takes an arg @@ -578,7 +578,7 @@ __yy_memcpy (char *to, char *from, unsigned int count) #endif #endif - + #line 217 /usr/lib/bison.simple /* The user can define
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - configure.in
configure.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3c21a3189e93837dc0f78259391733a169deb2ec Author: Kalman Szalai - KAMI kami...@gmail.com Date: Sun Apr 8 11:20:44 2012 +0200 Add Barcode 1.3.5.0 extension Barcode 1.3.5.0 release: * LibreOffice 3.4.x-3.5.x support * Resizeable barcodes * CODE128 fix (cherry picked from commit 39d8a541e623fd3ae91e28dc6dfc34411bf23b57) Signed-off-by: Miklos Vajna vmik...@suse.cz diff --git a/configure.in b/configure.in index 8e45756..825edda 100644 --- a/configure.in +++ b/configure.in @@ -8114,7 +8114,7 @@ AC_MSG_CHECKING([for Barcode extension integration]) BARCODE_EXTENSION_PACK= if test x$enable_ext_barcode = xyes -a x$enable_extension_integration != xno; then SCPDEFS=$SCPDEFS -DWITH_EXTENSION_BARCODE - BARCODE_EXTENSION_PACK=7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt + BARCODE_EXTENSION_PACK=3ed18025a766f1e955707b969c8113a5-Barcode_1.3.5.0.oxt AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vbahelper/source
vbahelper/source/vbahelper/vbaglobalbase.cxx | 29 --- 1 file changed, 26 insertions(+), 3 deletions(-) New commits: commit 0dda8f1933ef9cea3b10e2958e28023d9dc54399 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Apr 12 13:04:39 2012 +0200 Set DefaultContext property of service manager/component context combo ...to avoid mismatch warnings from OServiceManager::createInstanceWithContext. diff --git a/vbahelper/source/vbahelper/vbaglobalbase.cxx b/vbahelper/source/vbahelper/vbaglobalbase.cxx index efb2848..615c6f5 100644 --- a/vbahelper/source/vbahelper/vbaglobalbase.cxx +++ b/vbahelper/source/vbahelper/vbaglobalbase.cxx @@ -29,8 +29,10 @@ #include sal/macros.h #include cppuhelper/component_context.hxx +#include cppuhelper/exc_hlp.hxx #include comphelper/processfactory.hxx #include com/sun/star/container/XNameContainer.hpp +#include com/sun/star/lang/WrappedTargetRuntimeException.hpp using namespace com::sun::star; using namespace ooo::vba; @@ -47,21 +49,42 @@ const uno::Reference uno::XComponentContext xContext, const rtl::OUString s { // overwrite context with custom one ( that contains the application ) // wrap the service manager as we don't want the disposing context to tear down the 'normal' ServiceManager ( or at least thats what the code appears like it wants to do ) -uno::Any aSrvMgr; +uno::Reference uno::XInterface aSrvMgr; if ( xContext.is() xContext-getServiceManager().is() ) { -aSrvMgr = uno::makeAny( xContext-getServiceManager()-createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(com.sun.star.comp.stoc.OServiceManagerWrapper) ), xContext ) ); +aSrvMgr = xContext-getServiceManager()-createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(com.sun.star.comp.stoc.OServiceManagerWrapper) ), xContext ); } ::cppu::ContextEntry_Init aHandlerContextInfo[] = { ::cppu::ContextEntry_Init( msApplication, uno::Any() ), ::cppu::ContextEntry_Init( sDocCtxName, uno::Any() ), -::cppu::ContextEntry_Init( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(/singletons/com.sun.star.lang.theServiceManager ) ), aSrvMgr ) +::cppu::ContextEntry_Init( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(/singletons/com.sun.star.lang.theServiceManager ) ), uno::makeAny( aSrvMgr ) ) }; // don't pass a delegate, this seems to introduce yet another cyclic dependency ( and // some strange behavior mxContext = ::cppu::createComponentContext( aHandlerContextInfo, SAL_N_ELEMENTS( aHandlerContextInfo ), NULL ); +if ( aSrvMgr.is() ) +{ +try +{ +uno::Reference beans::XPropertySet ( +aSrvMgr, uno::UNO_QUERY_THROW )- +setPropertyValue( DefaultContext, uno::makeAny( mxContext ) ); +} +catch ( uno::RuntimeException ) +{ +throw; +} +catch ( uno::Exception ) +{ +uno::Any e(cppu::getCaughtException()); +throw lang::WrappedTargetRuntimeException( +(VbaGlobalsBase ctor, setting OServiceManagerWrapper + DefaultContext failed), +uno::Reference uno::XInterface (), e); +} +} } VbaGlobalsBase::~VbaGlobalsBase() ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - framework/source officecfg/registry
framework/source/services/backingwindow.cxx| 19 ++ officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |7 --- 2 files changed, 20 insertions(+), 6 deletions(-) New commits: commit 5f2825dde8a44773fc6ce19f2dd4e328c4e88eaf Author: Gábor Stefanik netrolller...@gmail.com Date: Thu Apr 12 14:08:02 2012 +0200 fdo#34392 recompute column widths after font scale change in startcenter diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx index ca0e9e7..0b07e6f 100644 --- a/framework/source/services/backingwindow.cxx +++ b/framework/source/services/backingwindow.cxx @@ -273,6 +273,8 @@ void BackingWindow::DataChanged( const DataChangedEvent rDCEvt ) { initBackground(); Invalidate(); +// fdo#34392: Resize buttons to match the new text size. +Resize(); } } @@ -797,6 +799,23 @@ void BackingWindow::Resize() long nYPos = maControlRect.Top() + mnBtnTop; +// Recompute column widths +mnTextColumnWidth[0] = maWriterButton.GetTextWidth( maWriterButton.GetText() ) + maButtonImageSize.Width() + 8; +if( mnTextColumnWidth[0] maCalcButton.GetTextWidth( maCalcButton.GetText() ) + maButtonImageSize.Width() + 8 ) +mnTextColumnWidth[0] = maCalcButton.GetTextWidth( maCalcButton.GetText() ) + maButtonImageSize.Width() + 8; +if( mnTextColumnWidth[0] maImpressButton.GetTextWidth( maImpressButton.GetText() ) + maButtonImageSize.Width() + 8 ) +mnTextColumnWidth[0] = maImpressButton.GetTextWidth( maImpressButton.GetText() ) + maButtonImageSize.Width() + 8; +if( mnTextColumnWidth[0] maOpenButton.GetTextWidth( maOpenButton.GetText() ) + maButtonImageSize.Width() + 26 ) +mnTextColumnWidth[0] = maOpenButton.GetTextWidth( maOpenButton.GetText() ) + maButtonImageSize.Width() + 26; + +mnTextColumnWidth[1] = maDrawButton.GetTextWidth( maDrawButton.GetText() ) + maButtonImageSize.Width() + 8; +if( mnTextColumnWidth[1] maDBButton.GetTextWidth( maDBButton.GetText() ) + maButtonImageSize.Width() + 8 ) +mnTextColumnWidth[1] = maDBButton.GetTextWidth( maDBButton.GetText() ) + maButtonImageSize.Width() + 8; +if( mnTextColumnWidth[1] maMathButton.GetTextWidth( maMathButton.GetText() ) + maButtonImageSize.Width() + 8 ) +mnTextColumnWidth[1] = maMathButton.GetTextWidth( maMathButton.GetText() ) + maButtonImageSize.Width() + 8; +if( mnTextColumnWidth[1] maTemplateButton.GetTextWidth( maTemplateButton.GetText() ) + maButtonImageSize.Width() + 8 ) +mnTextColumnWidth[1] = maTemplateButton.GetTextWidth( maTemplateButton.GetText() ) + maButtonImageSize.Width() + 8; + maWriterButton.SetPosSizePixel( Point( maControlRect.Left() + mnBtnPos, nYPos ), Size( mnTextColumnWidth[0], maButtonImageSize.Height() ) ); maDrawButton.SetPosSizePixel( Point( maControlRect.Left() + mnBtnPos + mnColumnWidth[0], nYPos ), Size( mnTextColumnWidth[1], maButtonImageSize.Height() ) ); nYPos += nBDelta - nDiff; commit 25c194163c531648f7ad8cdb1a64a03407f75efc Author: Andras Timar ati...@suse.com Date: Thu Apr 12 12:55:55 2012 +0200 fdo#48584 Shift+F3 should be the shourtcut for Edit Duplicate in Draw ... just like it is in Impress. The fix for fdo#32559 was partially reverted. I think .uno:CopyObjects is more useful in Draw, than .uno:ChangeCaseRotateCase. diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu index 30702f9..685b7b4 100644 --- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu @@ -1131,14 +1131,9 @@ value xml:lang=en-US.uno:LeaveGroup/value /prop /node -!--node oor:name=F3_SHIFT oor:op=replace - prop oor:name=Commandvalue xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value - value xml:lang=en-US.uno:CopyObjects/value - /prop -/node-- node oor:name=F3_SHIFT oor:op=replace prop oor:name=Commandvalue xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value - value xml:lang=en-US.uno:ChangeCaseRotateCase/value + value xml:lang=en-US.uno:CopyObjects/value /prop /node node oor:name=F4 oor:op=replace ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/inc
oox/inc/oox/vml/vmlshape.hxx | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) New commits: commit 99deffbeba414443ec7e0961501d5dcbc475b07d Author: Miklos Vajna vmik...@suse.cz Date: Thu Apr 12 14:16:38 2012 +0200 oox: fix doxygen syntax to avoid misleading output in ShapeModel diff --git a/oox/inc/oox/vml/vmlshape.hxx b/oox/inc/oox/vml/vmlshape.hxx index c6c6cb6..d11e34a 100644 --- a/oox/inc/oox/vml/vmlshape.hxx +++ b/oox/inc/oox/vml/vmlshape.hxx @@ -182,13 +182,13 @@ struct ShapeModel typedef ::std::auto_ptr ClientDataClientDataPtr; SAL_WNODEPRECATED_DECLARATIONS_POP -::rtl::OUString maType; /// Shape template with default properties. -PointVector maPoints; /// Points for the polyline shape. -TextBoxPtr mxTextBox; /// Text contents and properties. -ClientDataPtr mxClientData; /// Excel specific client data. -::rtl::OUString maLegacyDiagramPath;/// Legacy Diagram Fragment Path -::rtl::OUString maFrom; /// Start point for line shape. -::rtl::OUString maTo; /// End point for line shape. +::rtl::OUString maType; /// Shape template with default properties. +PointVector maPoints; /// Points for the polyline shape. +TextBoxPtr mxTextBox; /// Text contents and properties. +ClientDataPtr mxClientData; /// Excel specific client data. +::rtl::OUString maLegacyDiagramPath;/// Legacy Diagram Fragment Path +::rtl::OUString maFrom; /// Start point for line shape. +::rtl::OUString maTo; /// End point for line shape. explicitShapeModel(); ~ShapeModel(); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/inc editeng/qa editeng/source test/Library_test.mk test/source
editeng/inc/editeng/eerdll.hxx|1 - editeng/qa/unit/core-test.cxx |2 +- editeng/source/editeng/eerdll.cxx | 19 +-- test/Library_test.mk |1 - test/source/bootstrapfixture.cxx |2 -- 5 files changed, 6 insertions(+), 19 deletions(-) New commits: commit 43aabb908e3dacd1b1b2effb215b04147de4016e Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 12 13:25:01 2012 +0100 partially revert the editeng singleton stuff to get build to complete diff --git a/editeng/inc/editeng/eerdll.hxx b/editeng/inc/editeng/eerdll.hxx index 5fd9896..00094cf 100644 --- a/editeng/inc/editeng/eerdll.hxx +++ b/editeng/inc/editeng/eerdll.hxx @@ -53,7 +53,6 @@ public: ResMgr* GetResMgr() const { return pResMgr; } GlobalEditData* GetGlobalData() const { return pGlobalData; } static EditDLL Get(); -EDITENG_DLLPUBLIC static void Release(); }; #define EE_DLL() EditDLL::Get() diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx index fc5828f..61db59f 100644 --- a/editeng/qa/unit/core-test.cxx +++ b/editeng/qa/unit/core-test.cxx @@ -55,7 +55,7 @@ public: void testConstruction(); CPPUNIT_TEST_SUITE(Test); -CPPUNIT_TEST(testConstruction); +//CPPUNIT_TEST(testConstruction); CPPUNIT_TEST_SUITE_END(); private: diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx index ccec18e..1e0f3e4 100644 --- a/editeng/source/editeng/eerdll.cxx +++ b/editeng/source/editeng/eerdll.cxx @@ -72,27 +72,18 @@ #include editeng/xmlcnitm.hxx #include editeng/forbiddencharacterstable.hxx #include editeng/justifyitem.hxx - -#include boost/scoped_ptr.hpp +#include rtl/instance.hxx using namespace ::com::sun::star; -namespace { - -boost::scoped_ptrEditDLL pDLL; - -} - -EditDLL EditDLL::Get() +namespace { -if (!pDLL) -pDLL.reset(new EditDLL); -return *pDLL; +class theEditDLL : public rtl::StaticEditDLL, theEditDLL {}; } -void EditDLL::Release() +EditDLL EditDLL::Get() { -pDLL.reset(); +return theEditDLL::get(); } GlobalEditData::GlobalEditData() diff --git a/test/Library_test.mk b/test/Library_test.mk index f66e101..571d26c 100644 --- a/test/Library_test.mk +++ b/test/Library_test.mk @@ -42,7 +42,6 @@ $(eval $(call gb_Library_use_libraries,test,\ comphelper \ cppu \ cppuhelper \ -editeng \ i18nisolang1 \ sal \ tl \ diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx index f4b8139..284dbf7 100644 --- a/test/source/bootstrapfixture.cxx +++ b/test/source/bootstrapfixture.cxx @@ -42,7 +42,6 @@ #include vcl/svapp.hxx #include tools/resmgr.hxx #include unotools/syslocaleoptions.hxx -#include editeng/eerdll.hxx using namespace ::com::sun::star; @@ -108,7 +107,6 @@ void test::BootstrapFixture::setUp() void test::BootstrapFixture::tearDown() { ucbhelper::ContentBroker::deinitialize(); -EditDLL::Release(); test::BootstrapFixtureBase::tearDown(); } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sd/source
sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx|3 - sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx | 16 -- sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx | 24 +-- sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx |9 + sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx |8 + sd/source/ui/slidesorter/controller/SlsListener.cxx | 16 +++--- sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 13 +++- sd/source/ui/slidesorter/model/SlideSorterModel.cxx |2 - sd/source/ui/slidesorter/shell/SlideSorterService.cxx| 12 ++- sd/source/ui/slidesorter/view/SlsButtonBar.cxx |2 - sd/source/ui/slidesorter/view/SlsFontProvider.cxx|3 - sd/source/ui/table/TableDesignPane.cxx | 21 ++--- sd/source/ui/table/tablefunction.cxx |4 +- 13 files changed, 52 insertions(+), 81 deletions(-) New commits: commit 674ed53bc00fbbbfec5661cbafcaa79669927cb8 Author: Olivier Hallot olivier.hal...@alta.org.br Date: Thu Apr 12 10:04:33 2012 -0300 More RTL_CONSTASCII_USTRINGPARAM removals module sd/../ui diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index fdd01a4..8c51857 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx @@ -488,10 +488,8 @@ void SAL_CALL Listener::propertyChange ( { ThrowIfDisposed(); -static const ::rtl::OUString sCurrentPagePropertyName ( -RTL_CONSTASCII_USTRINGPARAM(CurrentPage)); -static const ::rtl::OUString sEditModePropertyName ( -RTL_CONSTASCII_USTRINGPARAM(IsMasterPageMode)); +static const ::rtl::OUString sCurrentPagePropertyName (CurrentPage); +static const ::rtl::OUString sEditModePropertyName (IsMasterPageMode); if (rEvent.PropertyName.equals(sCurrentPagePropertyName)) { @@ -501,8 +499,7 @@ void SAL_CALL Listener::propertyChange ( { try { -Any aPageNumber = xPageSet-getPropertyValue ( -String(RTL_CONSTASCII_USTRINGPARAM(Number))); +Any aPageNumber = xPageSet-getPropertyValue (Number); sal_Int32 nCurrentPage = 0; aPageNumber = nCurrentPage; // The selection is already set but we call SelectPage() @@ -592,8 +589,7 @@ void Listener::UpdateEditMode (void) { try { -Any aValue (xSet-getPropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(IsMasterPageMode; +Any aValue (xSet-getPropertyValue( IsMasterPageMode )); aValue = bIsMasterPageMode; } catch (beans::UnknownPropertyException) @@ -693,9 +689,7 @@ void Listener::ThrowIfDisposed (void) { if (rBHelper.bDisposed || rBHelper.bInDispose) { -throw lang::DisposedException ( -::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( -SlideSorterController object has already been disposed)), +throw lang::DisposedException (SlideSorterController object has already been disposed, static_castuno::XWeak*(this)); } } diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index fc5eec6..dcdad2b 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -828,11 +828,11 @@ void SlotManager::GetStatusBarState (SfxItemSet rSet) SdPage* pFirstPage = NULL; sal_uInt16 nFirstPage; sal_uInt16 nSelectedPages = (sal_uInt16)mrSlideSorter.GetController().GetPageSelector().GetSelectedPageCount(); -String aPageStr; +rtl::OUString aPageStr; String aLayoutStr; if (nSelectedPages 0) -aPageStr = String(SdResId(STR_SD_PAGE)); +aPageStr = rtl::OUString(ResId::toString(SdResId(STR_SD_PAGE))); if (nSelectedPages == 1) { @@ -846,11 +846,10 @@ void SlotManager::GetStatusBarState (SfxItemSet rSet) nFirstPage = pPage-GetPageNum()/2; pFirstPage = pPage; -aPageStr += sal_Unicode(' '); -aPageStr += String::CreateFromInt32( nFirstPage + 1 ); -aPageStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( / )); -aPageStr += String::CreateFromInt32( -mrSlideSorter.GetModel().GetPageCount()); +aPageStr += ; +aPageStr += rtl::OUString::valueOf( nFirstPage + 1 ); +aPageStr += / ; +aPageStr += rtl::OUString::valueOf(mrSlideSorter.GetModel().GetPageCount()); aLayoutStr = pFirstPage-GetLayoutName(); aLayoutStr.Erase( aLayoutStr.SearchAscii( SD_LT_SEPARATOR ) ); diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
[Libreoffice-commits] .: dictionaries/en
dictionaries/en/dictionaries.xcu |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 05f89ef6371a108ebc4e7763541407a2552ab274 Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 12 14:49:46 2012 +0100 These countries use British spelling rules diff --git a/dictionaries/en/dictionaries.xcu b/dictionaries/en/dictionaries.xcu index 81e7142..5c37803 100644 --- a/dictionaries/en/dictionaries.xcu +++ b/dictionaries/en/dictionaries.xcu @@ -10,7 +10,7 @@ valueDICT_SPELL/value /prop prop oor:name=Locales oor:type=oor:string-list -valueen-GB en-IE en-IN/value +valueen-GB en-BS en-BZ en-GH en-IE en-IN en-JM en-NZ en-TT/value /prop /node node oor:name=HunSpellDic_en-ZA oor:op=fuse @@ -21,7 +21,7 @@ valueDICT_SPELL/value /prop prop oor:name=Locales oor:type=oor:string-list -valueen-ZA en-NA en-ZW/value +valueen-ZA en-MW en-NA en-ZW/value /prop /node node oor:name=HunSpellDic_en-US oor:op=fuse @@ -65,7 +65,7 @@ valueDICT_HYPH/value /prop prop oor:name=Locales oor:type=oor:string-list -valueen-GB en-ZA en-NA en-ZW en-AU en-CA en-IE en-IN en-BZ en-BS en-GH en-JM en-NZ en-TT/value +valueen-GB en-ZA en-NA en-ZW en-AU en-CA en-IE en-IN en-BZ en-BS en-GH en-JM en-MW en-NZ en-TT/value /prop /node node oor:name=HyphDic_en-US oor:op=fuse @@ -87,7 +87,7 @@ valueDICT_THES/value /prop prop oor:name=Locales oor:type=oor:string-list -valueen-GB en-US en-PH en-ZA en-NA en-ZW en-AU en-CA en-IE en-IN en-BZ en-BS en-GH en-JM en-NZ en-TT/value +valueen-GB en-US en-PH en-ZA en-NA en-ZW en-AU en-CA en-IE en-IN en-BZ en-BS en-GH en-JM en-MW en-NZ en-TT/value /prop /node /node ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sd/source
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ab05fbd16e3613494731414276f63b5a03e164e9 Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 12 15:11:38 2012 +0100 fix build diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index dcdad2b..9d37e45 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -847,7 +847,7 @@ void SlotManager::GetStatusBarState (SfxItemSet rSet) pFirstPage = pPage; aPageStr += ; -aPageStr += rtl::OUString::valueOf( nFirstPage + 1 ); +aPageStr += rtl::OUString::valueOf( static_castsal_Int32(nFirstPage + 1) ); aPageStr += / ; aPageStr += rtl::OUString::valueOf(mrSlideSorter.GetModel().GetPageCount()); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: tools/inc
tools/inc/tools/string.hxx | 10 ++ 1 file changed, 10 insertions(+) New commits: commit 2110e5e838648ae4054ca74cdc587c12370223a5 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Thu Apr 12 16:34:16 2012 +0200 operator for ostream + UniString This should make even String be easily usable with SAL_DEBUG stuff (the same like 2ac5b08361bf0c7c98ff9bc10869e2b41c9d85fd for OUString). diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx index edecd2f..0d6b26b 100644 --- a/tools/inc/tools/string.hxx +++ b/tools/inc/tools/string.hxx @@ -343,6 +343,16 @@ inline UniString UniString::GetQuotedToken( xub_StrLen nToken, const UniString return GetQuotedToken( nToken, rQuotedPairs, cTok, nTempPos ); } +template typename charT, typename traits std::basic_ostreamcharT, traits +operator ( +std::basic_ostreamcharT, traits stream, UniString const string) +{ +return stream +rtl::OUStringToOString(string, RTL_TEXTENCODING_UTF8).getStr(); +// best effort; potentially loses data due to conversion failures +// (stray surrogate halves) and embedded null characters +} + #endif // _STRING_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b30c9f7d8eea41fadcf3ff09db9e005f2f266006 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Thu Apr 12 17:55:28 2012 +0200 ++I_hate_sal_Int32 diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 4b918fd..ed18354 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -2104,7 +2104,7 @@ void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode rGrfNode, const Size } // picture description ::sax_fastparser::FastAttributeList* attrList = m_pSerializer-createAttrList(); -attrList-add( XML_id, OString::valueOf( m_anchorId++ ).getStr()); +attrList-add( XML_id, OString::valueOf( sal_Int32( m_anchorId++ )).getStr()); attrList-add( XML_name, Picture ); attrList-add( XML_descr, OUStringToOString( rGrfNode.GetDescription(), RTL_TEXTENCODING_UTF8 ).getStr()); if( GetExport().GetFilter().getVersion( ) != oox::core::ECMA_DIALECT ) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - basic/source
basic/source/basmgr/basmgr.cxx | 12 +++- basic/source/sbx/sbxconv.hxx |2 ++ basic/source/sbx/sbxcurr.cxx | 11 +++ basic/source/sbx/sbxdec.cxx|3 --- 4 files changed, 12 insertions(+), 16 deletions(-) New commits: commit a9bad6b8f99dfb1640fbbff3f29036182f0103f6 Author: Takeshi Abe t...@fixedpoint.jp Date: Fri Apr 13 02:16:31 2012 +0900 made the search straightforward diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index 5e909b2..3de240f 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -533,12 +533,14 @@ void BasicLibs::Insert( BasicLibInfo* LibInfo ) BasicLibInfo* BasicLibs::Remove( BasicLibInfo* LibInfo ) { -size_t i = GetPos( LibInfo ); -if ( i aList.size() ) +vector BasicLibInfo* ::iterator it, eit = aList.end(); +for (it = aList.begin(); it != eit; ++it) { -vector BasicLibInfo* ::iterator it = aList.begin(); -advance( it , i ); -it = aList.erase( it ); +if (*it == LibInfo) +{ +aList.erase(it); +break; +} } return LibInfo; } commit 7465f5e604ee449006a243f1d55cb0882bb58ac1 Author: Takeshi Abe t...@fixedpoint.jp Date: Fri Apr 13 02:15:12 2012 +0900 extract ImpGetIntntlSep() into sbxconv.hxx and reuse it diff --git a/basic/source/sbx/sbxconv.hxx b/basic/source/sbx/sbxconv.hxx index 2a11f15..8c0a4b1 100644 --- a/basic/source/sbx/sbxconv.hxx +++ b/basic/source/sbx/sbxconv.hxx @@ -42,6 +42,8 @@ extern SbxError ImpScan // with advanced evaluation (International, TRUE/FALSE) extern sal_Bool ImpConvStringExt( ::rtl::OUString rSrc, SbxDataType eTargetType ); +void ImpGetIntntlSep( sal_Unicode rcDecimalSep, sal_Unicode rcThousandSep ); + // SBXINT.CXX double ImpRound( double ); diff --git a/basic/source/sbx/sbxcurr.cxx b/basic/source/sbx/sbxcurr.cxx index 20a3968..a418346 100644 --- a/basic/source/sbx/sbxcurr.cxx +++ b/basic/source/sbx/sbxcurr.cxx @@ -40,13 +40,10 @@ static rtl::OUString ImpCurrencyToString( const sal_Int64 rVal ) bool isNeg = ( rVal 0 ); sal_Int64 absVal = isNeg ? -rVal : rVal; -SvtSysLocale aSysLocale; sal_Unicode cDecimalSep = '.'; #if MAYBEFUTURE sal_Unicode cThousandSep = ','; -const LocaleDataWrapper rData = aSysLocale.GetLocaleData(); -cDecimalSep = rData.getNumDecimalSep().GetBuffer()[0]; -cThousandSep = rData.getNumThousandSep().GetBuffer()[0]; +ImpGetIntntlSep( cDecimalSep, cThousandSep ); #endif rtl::OUString aAbsStr = rtl::OUString::valueOf( absVal ); @@ -119,14 +116,12 @@ static sal_Int64 ImpStringToCurrency( const rtl::OUString rStr ) sal_Int32 nFractDigit = 4; -SvtSysLocale aSysLocale; sal_Unicode cDeciPnt = sal_Unicode('.'); sal_Unicode c1000Sep = sal_Unicode(','); #if MAYBEFUTURE -const LocaleDataWrapper rData = aSysLocale.GetLocaleData(); -sal_Unicode cLocaleDeciPnt = rData.getNumDecimalSep().GetBuffer()[0]; -sal_Unicode cLocale1000Sep = rData.getNumThousandSep().GetBuffer()[0]; +sal_Unicode cLocaleDeciPnt, cLocale1000Sep; +ImpGetIntntlSep( cLocaleDeciPnt, cLocale1000Sep ); // score each set of separators (Locale and Basic) on total number of matches // if one set has more matches use that set diff --git a/basic/source/sbx/sbxdec.cxx b/basic/source/sbx/sbxdec.cxx index 320c444..50d1759 100644 --- a/basic/source/sbx/sbxdec.cxx +++ b/basic/source/sbx/sbxdec.cxx @@ -201,9 +201,6 @@ void SbxDecimal::setUInt( unsigned int val ) setULong( (sal_uInt32)val ); } -// sbxscan.cxx -void ImpGetIntntlSep( sal_Unicode rcDecimalSep, sal_Unicode rcThousandSep ); - bool SbxDecimal::setString( ::rtl::OUString* pOUString ) { static LCID nLANGID = MAKELANGID( LANG_ENGLISH, SUBLANG_ENGLISH_US ); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/core/text/frminf.cxx | 51 +- sw/source/core/text/itrtxt.hxx | 60 - sw/source/core/text/porfld.hxx | 44 +++--- sw/source/core/text/porlin.hxx | 37 - 4 files changed, 95 insertions(+), 97 deletions(-) New commits: commit c5718b012fcbd19c79ff6eb07ca00a39ae643d8d Author: Philipp Weissenbacher p.weissenbac...@gmail.com Date: Thu Apr 12 20:09:53 2012 +0200 Translate German comments diff --git a/sw/source/core/text/frminf.cxx b/sw/source/core/text/frminf.cxx index 8808032..93b4c01 100644 --- a/sw/source/core/text/frminf.cxx +++ b/sw/source/core/text/frminf.cxx @@ -75,7 +75,7 @@ xub_StrLen SwTxtMargin::GetTxtEnd() const * SwTxtFrmInfo::IsOneLine() */ -// Passt der Absatz in eine Zeile? +// Does the paragraph fit into one line? sal_Bool SwTxtFrmInfo::IsOneLine() const { const SwLineLayout *pLay = pFrm-GetPara(); @@ -83,7 +83,7 @@ sal_Bool SwTxtFrmInfo::IsOneLine() const return sal_False; else { -// 6575: bei Follows natuerlich sal_False +// For follows sal_False of course if( pFrm-GetFollow() ) return sal_False; pLay = pLay-GetNext(); @@ -101,7 +101,7 @@ sal_Bool SwTxtFrmInfo::IsOneLine() const * SwTxtFrmInfo::IsFilled() */ -// Ist die Zeile zu X% gefuellt? +// Is the line filled for X percent? sal_Bool SwTxtFrmInfo::IsFilled( const sal_uInt8 nPercent ) const { const SwLineLayout *pLay = pFrm-GetPara(); @@ -120,7 +120,7 @@ sal_Bool SwTxtFrmInfo::IsFilled( const sal_uInt8 nPercent ) const * SwTxtFrmInfo::GetLineStart() */ -// Wo beginnt der Text (ohne whitespaces)? ( Dokument global ) +// Where does the text start (without whitespace)? (document global) SwTwips SwTxtFrmInfo::GetLineStart( const SwTxtCursor rLine ) const { xub_StrLen nTxtStart = rLine.GetTxtStart(); @@ -143,7 +143,7 @@ SwTwips SwTxtFrmInfo::GetLineStart( const SwTxtCursor rLine ) const * SwTxtFrmInfo::GetLineStart() */ -// Wo beginnt der Text (ohne whitespaces)? (rel. im Frame) +// Where does the text start (without whitespace)? (relative in the Frame) SwTwips SwTxtFrmInfo::GetLineStart() const { SwTxtSizeInfo aInf( (SwTxtFrm*)pFrm ); @@ -151,7 +151,7 @@ SwTwips SwTxtFrmInfo::GetLineStart() const return GetLineStart( aLine ) - pFrm-Frm().Left() - pFrm-Prt().Left(); } -// errechne die Position des Zeichens und gebe die Mittelposition zurueck +// Calculates the character's position and returns the middle position SwTwips SwTxtFrmInfo::GetCharPos( xub_StrLen nChar, sal_Bool bCenter ) const { SWRECTFN( pFrm ) @@ -197,11 +197,11 @@ SwPaM *AddPam( SwPaM *pPam, const SwTxtFrm* pTxtFrm, { if( nLen ) { -// Es koennte auch der erste sein. +// It could be the first if( pPam-HasMark() ) { -// liegt die neue Position genau hinter der aktuellen, dann -// erweiter den Pam einfach +// If the new position is right after the current one, then +// simply extend the Pam if( nPos == pPam-GetPoint()-nContent.GetIndex() ) { pPam-GetPoint()-nContent += nLen; @@ -218,7 +218,7 @@ SwPaM *AddPam( SwPaM *pPam, const SwTxtFrm* pTxtFrm, return pPam; } -// Sammelt die whitespaces am Zeilenbeginn und -ende im Pam +// Accumulates the whitespace at line start and end in the Pam void SwTxtFrmInfo::GetSpaces( SwPaM rPam, sal_Bool bWithLineBreak ) const { SwTxtSizeInfo aInf( (SwTxtFrm*)pFrm ); @@ -230,14 +230,14 @@ void SwTxtFrmInfo::GetSpaces( SwPaM rPam, sal_Bool bWithLineBreak ) const if( aLine.GetCurr()-GetLen() ) { xub_StrLen nPos = aLine.GetTxtStart(); -// Bug 49649: von der ersten Line die Blanks/Tabs NICHT -// mit selektieren +// Do NOT include the blanks/tabs from the first line +// in the selection if( !bFirstLine nPos aLine.GetStart() ) pPam = AddPam( pPam, pFrm, aLine.GetStart(), nPos - aLine.GetStart() ); -// Bug 49649: von der letzten Line die Blanks/Tabs NICHT -// mit selektieren +// Do NOT include the blanks/tabs from the last line +// in the selection if( aLine.GetNext() ) { nPos = aLine.GetTxtEnd(); @@ -260,7 +260,7 @@ void SwTxtFrmInfo::GetSpaces( SwPaM rPam, sal_Bool bWithLineBreak ) const *
[Libreoffice-commits] .: 3 commits - Makefile.post scripting/Jar_ScriptProviderForBeanShell.mk solenv/gbuild
Makefile.post |6 +- scripting/Jar_ScriptProviderForBeanShell.mk |3 +-- solenv/gbuild/LinkTarget.mk | 11 ++- 3 files changed, 12 insertions(+), 8 deletions(-) New commits: commit a4f4e51304e9c26b58d4ab5ee4f0a63e3cd4ec91 Author: Matúš Kukan matus.ku...@gmail.com Date: Wed Apr 11 17:24:06 2012 +0200 use gb_Helper_make_url here diff --git a/scripting/Jar_ScriptProviderForBeanShell.mk b/scripting/Jar_ScriptProviderForBeanShell.mk index abe6125..7ef9af6 100644 --- a/scripting/Jar_ScriptProviderForBeanShell.mk +++ b/scripting/Jar_ScriptProviderForBeanShell.mk @@ -42,10 +42,9 @@ $(eval $(call gb_Jar_use_externals,ScriptProviderForBeanShell,\ $(eval $(call gb_Jar_set_manifest,ScriptProviderForBeanShell,$(SRCDIR)/scripting/java/com/sun/star/script/framework/provider/beanshell/MANIFEST.MF)) -#TODO: Ensure file://$(BSH_JAR) is a proper file URL: ifeq ($(SYSTEM_BSH),YES) $(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForBeanShell, \ -ScriptFramework.jar file://$(BSH_JAR))) +ScriptFramework.jar $(call gb_Helper_make_url,$(BSH_JAR else $(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForBeanShell, \ ScriptFramework.jar bsh.jar)) commit 803b1840c860be843e370108febbf7b89e71 Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Apr 10 12:12:40 2012 +0200 include environment also here diff --git a/Makefile.post b/Makefile.post index bfa8b34..76ea25b 100644 --- a/Makefile.post +++ b/Makefile.post @@ -1,7 +1,11 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -gb_SourceEnvAndRecurse_STAGE=gbuild +ifeq ($(strip $(SOLARENV)),) +include $(dir $(realpath $(firstword $(MAKEFILE_LISTconfig_host.mk +endif + include $(SOLARENV)/gbuild/gbuild.mk + $(eval $(call gb_Module_make_global_targets,$(wildcard $(SRCDIR)/RepositoryModule_*.mk))) # vim: set noet sw=4 ts=4: commit 5a248896bee2a20685ec32f85b3992a1b747355d Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Apr 10 03:04:49 2012 +0200 gbuild: use = external headers This fixes circular dependencies. diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 37e2025..8d886c6 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -617,7 +617,8 @@ endif endef define gb_LinkTarget__use_internal_api_one -$(call gb_LinkTarget__add_internal_headers,$(1),$(call gb_UnoApiHeadersTarget_get_$(3)target,$(api))) +$(call gb_LinkTarget_get_external_headers_target,$(1)) :| \ + $(call gb_UnoApiHeadersTarget_get_$(3)target,$(api)) $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : INCLUDE += -I$(call gb_UnoApiHeadersTarget_get_$(3)dir,$(api)) ifeq ($(gb_FULLDEPS),$(true)) @@ -995,13 +996,13 @@ $$(call gb_Output_error,\ endef define gb_LinkTarget__use_custom_headers +$(call gb_LinkTarget_get_external_headers_target,$(1)) :| \ + $(call gb_CustomTarget_get_target,$(2)) $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : INCLUDE += -I$(call gb_CustomTarget_get_workdir,$(2)) ifeq ($(gb_FULLDEPS),$(true)) $(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE += -I$(call gb_CustomTarget_get_workdir,$(2)) endif -$(call gb_LinkTarget__add_internal_headers,$(1),$(call gb_CustomTarget_get_target,$(2))) -$(call gb_LinkTarget_get_clean_target,$(1)) : $(call gb_CustomTarget_get_clean_target,$(2)) endef @@ -1028,8 +1029,8 @@ endef # use a header package, possibly from another module (i.e. via OUTDIR) define gb_LinkTarget_use_package -$(call gb_LinkTarget_get_headers_target,$(1) : | \ - $(call gb_Package_get_target,$(strip $(2 +$(call gb_LinkTarget_get_external_headers_target,$(1)) :| \ + $(call gb_Package_get_target,$(strip $(2))) endef ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: odk/examples
odk/examples/DevelopersGuide/Database/DriverSkeleton/OTypeInfo.hxx | 28 +- odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.hxx | 2 odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.hxx | 2 odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.hxx | 2 odk/examples/cpp/complextoolbarcontrols/MyListener.cxx | 4 - odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx | 6 +- 6 files changed, 22 insertions(+), 22 deletions(-) New commits: commit 62640a8436c837db6d1f63d98585b9929c36682d Author: Mark Wolf mark.wolf.mu...@gmail.com Date: Thu Apr 5 13:09:35 2012 -0400 German comment translation for odk folder Mark diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/OTypeInfo.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/OTypeInfo.hxx index ed2f763..dffe3e6 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/OTypeInfo.hxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/OTypeInfo.hxx @@ -43,26 +43,26 @@ namespace connectivity { struct OTypeInfo { -::rtl::OUString aTypeName; // Name des Types in der Datenbank -::rtl::OUString aLiteralPrefix; // Prefix zum Quoten -::rtl::OUString aLiteralSuffix; // Suffix zum Quoten -::rtl::OUString aCreateParams; // Parameter zum Erstellen +::rtl::OUString aTypeName; // Name of the the type in the database +::rtl::OUString aLiteralPrefix; // Prefix for literals +::rtl::OUString aLiteralSuffix; // Suffix for literals +::rtl::OUString aCreateParams; // Parameters to create ::rtl::OUString aLocalTypeName; -sal_Int32 nPrecision; // Laenge des Types +sal_Int32 nPrecision; // Length of the types -sal_Int16 nMaximumScale; // Nachkommastellen -sal_Int16 nMinimumScale; // Min Nachkommastellen +sal_Int16 nMaximumScale; // Decimal places (precision) +sal_Int16 nMinimumScale; // Min decimal places (precision) -sal_Int16 nType; // Datenbanktyp -sal_Int16 nSearchType;// kann nach dem Typen gesucht werden +sal_Int16 nType; // Database type +sal_Int16 nSearchType;// Can search for the type sal_Int16 nNumPrecRadix; // indicating the radix, which is usually 2 or 10 -sal_BoolbCurrency : 1,// Waehrung -bAutoIncrement : 1,// Ist es ein automatisch incrementierendes Feld -bNullable : 1,// Kann das Feld NULL annehmen -bCaseSensitive : 1,// Ist der Type Casesensitive -bUnsigned : 1,// Ist der Type Unsigned +sal_BoolbCurrency : 1,// Currency +bAutoIncrement : 1,// Is this field auto incrementing? +bNullable : 1,// Can this field assume a NULL value? +bCaseSensitive : 1,// Is this type case-sensitive? +bUnsigned : 1,// Is this type unsigned? bEmpty_1: 1,// for later use bEmpty_2: 1; diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.hxx index b01823f..315d781 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.hxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.hxx @@ -94,7 +94,7 @@ namespace connectivity virtual ~OPreparedStatement(); public: DECLARE_SERVICE_INFO(); -// ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: +// a constructor, which is required for returning objects: OPreparedStatement( OConnection* _pConnection,const TTypeInfoVector _TypeInfo,const ::rtl::OUString sql); //XInterface diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.hxx index 1560801..7ce5fd5 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.hxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.hxx @@ -56,7 +56,7 @@ namespace connectivity protected: virtual ~OResultSetMetaData(); public: -// ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: +// a constructor, which is required for returning objects: OResultSetMetaData(OConnection* _pConnection) : m_pConnection(_pConnection){} /// Avoid
[Libreoffice-commits] .: dbaccess/CppunitTest_dbaccess_macros_test.mk i18npool/Library_i18npool.mk sc/CppunitTest_sc_cellrangeobj.mk sc/CppunitTest_sc_chart_regression_test.mk sc/CppunitTest_sc_databa
dbaccess/CppunitTest_dbaccess_macros_test.mk |5 + i18npool/Library_i18npool.mk |9 + sc/CppunitTest_sc_cellrangeobj.mk|5 + sc/CppunitTest_sc_chart_regression_test.mk |5 + sc/CppunitTest_sc_databaserangeobj.mk|5 + sc/CppunitTest_sc_datapilotfieldobj.mk |5 + sc/CppunitTest_sc_datapilottableobj.mk |5 + sc/CppunitTest_sc_filters_test.mk|5 + sc/CppunitTest_sc_macros_test.mk |5 + sc/CppunitTest_sc_namedrangeobj.mk |5 + sc/CppunitTest_sc_namedrangesobj.mk |5 + sc/CppunitTest_sc_subsequent_filters_test.mk |5 + sc/CppunitTest_sc_tableautoformatfield.mk|5 + sc/CppunitTest_sc_ucalc.mk |2 -- sw/CppunitTest_sw_filters_test.mk|5 - sw/CppunitTest_sw_layout_test.mk |7 --- sw/CppunitTest_sw_macros_test.mk |7 --- sw/CppunitTest_sw_regression_test.mk |7 --- sw/CppunitTest_sw_swdoc_test.mk |1 - 19 files changed, 21 insertions(+), 77 deletions(-) New commits: commit 5dce272584cc79da727bdd4887d60cec04cbce11 Author: Matúš Kukan matus.ku...@gmail.com Date: Wed Apr 11 16:24:35 2012 +0200 move dependency on localedata_en to i18npool diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk index 2d48691..0f6e9de 100644 --- a/dbaccess/CppunitTest_dbaccess_macros_test.mk +++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk @@ -127,11 +127,8 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,dbaccess_macros_test,\ )) # we need to -# a) explicitly depend on library msword because it is not implied by a link -#relation -# b) explicitly depend on the sc resource files needed at unit-test runtime +# - explicitly depend on the dbaccess resource files needed at unit-test runtime $(call gb_CppunitTest_get_target,dbaccess_macros_test) : \ $(WORKDIR)/AllLangRes/dbaccess \ -$(call gb_Library_get_target,localedata_en) \ # vim: set noet sw=4 ts=4: diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk index 5ba850b..96ac0c8 100644 --- a/i18npool/Library_i18npool.mk +++ b/i18npool/Library_i18npool.mk @@ -148,4 +148,13 @@ $(eval $(call gb_Library_add_generated_cobjects,i18npool,\ CustomTarget/i18npool/breakiterator/$(notdir $(basename $(txt)))_brk) \ )) +# i18npool dlopens localedata_* libraries. +# This is runtime dependency to prevent tests +# to be run sooner then localedata_* exists. +$(call gb_Library_get_target,i18npool) : \ + $(call gb_Library_get_target,localedata_en) \ + $(call gb_Library_get_target,localedata_es) \ + $(call gb_Library_get_target,localedata_euro) \ + $(call gb_Library_get_target,localedata_others) \ + # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk index 5a66fd0..78e4aa0 100644 --- a/sc/CppunitTest_sc_cellrangeobj.mk +++ b/sc/CppunitTest_sc_cellrangeobj.mk @@ -128,11 +128,8 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_cellrangesbase,\ )) # we need to -# a) explicitly depend on library localedata_en because it is not implied by a link -#relation -# b) explicitly depend on the sc resource files needed at unit-test runtime +# - explicitly depend on the sc resource files needed at unit-test runtime $(call gb_CppunitTest_get_target,sc_cellrangesbase) : \ $(WORKDIR)/AllLangRes/sc \ -$(call gb_Library_get_target,localedata_en) \ # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk index 2c28e5a..603c2d9 100644 --- a/sc/CppunitTest_sc_chart_regression_test.mk +++ b/sc/CppunitTest_sc_chart_regression_test.mk @@ -135,11 +135,8 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_chart_regression_test,\ )) # we need to -# a) explicitly depend on library localedata_en because it is not implied by a link -#relation -# b) explicitly depend on the sc resource files needed at unit-test runtime +# - explicitly depend on the sc resource files needed at unit-test runtime $(call gb_CppunitTest_get_target,sc_chart_regression_test) : \ $(WORKDIR)/AllLangRes/sc \ -$(call gb_Library_get_target,localedata_en) \ # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk index a519a39..2374d97 100644 --- a/sc/CppunitTest_sc_databaserangeobj.mk +++ b/sc/CppunitTest_sc_databaserangeobj.mk @@ -127,11 +127,8 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_databaserangeobj,\ )) # we need to -# a) explicitly depend on library localedata_en because it is not implied by a link -#relation -# b) explicitly depend on the sc resource files needed at unit-test runtime +# - explicitly depend on the sc
[Libreoffice-commits] .: tools/bootstrp tools/Executable_rscdep.mk
tools/Executable_rscdep.mk |6 -- tools/bootstrp/rscdep.cxx |4 2 files changed, 10 deletions(-) New commits: commit 40775ce183ac29e9598cbca59e995c7e77327a1a Author: Matúš Kukan matus.ku...@gmail.com Date: Thu Apr 12 22:07:11 2012 +0200 HAVE_GETOPT is always NO for windows diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk index 2117162..a353b8d 100644 --- a/tools/Executable_rscdep.mk +++ b/tools/Executable_rscdep.mk @@ -57,15 +57,9 @@ $(eval $(call gb_Executable_add_exception_objects,rscdep,\ )) ifeq ($(OS),WNT) -ifeq ($(HAVE_GETOPT),YES) -$(eval $(call gb_Executable_add_defs,rscdep,\ --DHAVE_GETOPT \ -)) -else $(eval $(call gb_Executable_use_libraries,rscdep,\ gnu_getopt \ )) endif -endif # vim: set noet sw=4 ts=4: diff --git a/tools/bootstrp/rscdep.cxx b/tools/bootstrp/rscdep.cxx index f10448d..269086b 100644 --- a/tools/bootstrp/rscdep.cxx +++ b/tools/bootstrp/rscdep.cxx @@ -44,13 +44,9 @@ #include cppdep.hxx #if defined WNT -#if !defined HAVE_GETOPT #define __STDC__ 1 #define __GNU_LIBRARY__ #include external/glibc/getopt.h -#else -#include getopt.h -#endif #endif class RscHrcDep : public CppDep ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/ui/docshell/impex.cxx |8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) New commits: commit 2a2d04dff73b85185f7da59fea173a8bffb7c190 Author: Eike Rathke er...@redhat.com Date: Fri Apr 13 01:37:00 2012 +0200 one more lcl_appendLineData() for line size 64k Though this specific piece of code is not used in CSV import it may act on long lines now. diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index a8790bb..6227c3a 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -634,7 +634,13 @@ static const sal_Unicode* lcl_ScanString( const sal_Unicode* p, String rString, break; case DQM_CONCAT : if ( p0+1 p ) -rString.Append( p0, sal::static_int_castxub_StrLen( (p-1) - p0 ) ); // first part +{ +// first part +if (!lcl_appendLineData( rString, p0, p-1)) +{ +/* TODO: warning at UI, data truncated */ +} +} p0 = ++p; // text of next part starts here break; case DQM_SEPARATE : ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/ui/docshell/impex.cxx | 14 +- 1 file changed, 5 insertions(+), 9 deletions(-) New commits: commit 9f77876a96911a7138aa2081077a03abd34a9cf4 Author: Eike Rathke er...@redhat.com Date: Fri Apr 13 01:43:59 2012 +0200 two additional places to raise data truncated error for fdo#48516 diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 6227c3a..f33a0d7 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -606,7 +606,7 @@ enum DoubledQuoteMode }; static const sal_Unicode* lcl_ScanString( const sal_Unicode* p, String rString, -sal_Unicode cStr, DoubledQuoteMode eMode ) +sal_Unicode cStr, DoubledQuoteMode eMode, bool rbOverflowCell ) { p++;//! jump over opening quote bool bCont; @@ -637,9 +637,7 @@ static const sal_Unicode* lcl_ScanString( const sal_Unicode* p, String rString, { // first part if (!lcl_appendLineData( rString, p0, p-1)) -{ -/* TODO: warning at UI, data truncated */ -} +rbOverflowCell = true; } p0 = ++p; // text of next part starts here break; @@ -656,9 +654,7 @@ static const sal_Unicode* lcl_ScanString( const sal_Unicode* p, String rString, if ( p0 p ) { if (!lcl_appendLineData( rString, p0, ((*p || *(p-1) == cStr) ? p-1 : p))) -{ -/* TODO: warning at UI, data truncated */ -} +rbOverflowCell = true; } } while ( bCont ); return p; @@ -847,7 +843,7 @@ bool ScImportExport::Text2Doc( SvStream rStrm ) aCell.Erase(); if( *p == cStr ) { -p = lcl_ScanString( p, aCell, cStr, DQM_KEEP ); +p = lcl_ScanString( p, aCell, cStr, DQM_KEEP, bOverflowCell ); while( *p *p != cSep ) p++; if( *p ) @@ -1449,7 +1445,7 @@ const sal_Unicode* ScImportExport::ScanNextFieldFromString( const sal_Unicode* p { rbIsQuoted = true; const sal_Unicode* p1; -p1 = p = lcl_ScanString( p, rField, cStr, DQM_ESCAPE ); +p1 = p = lcl_ScanString( p, rField, cStr, DQM_ESCAPE, rbOverflowCell ); while ( *p !ScGlobal::UnicodeStrChr( pSeps, *p ) ) p++; // Append remaining unquoted and undelimited data (dirty, dirty) to ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: check : build dependency (was: Re: what exactly needs localedata_en library ?)
On Thu, Apr 12, 2012 at 09:13:30PM +0200, Matúš Kukan wrote: Maybe it is better to just let check target depend on build target ? No? Or do people use make check with demand to build only what is necessary for tests and nothing more ? Well, make check is for after a successful build to check the result, no? What especially is bad is when make install (thankfully gone) or make check rebuild unneeded stuff which gets rebuilt on every pass. IMHO it should just do what it does. Run the tests (yes, I know this involves some other round of going over all modules, but...) Regards, Rene ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Moved ScDefaultsOptions from ScDocOptions to separate class
Hi Kohei, Here is the other patch of re-factoring the options code, this time is the defaults options which I moved from ScDocOptions into a separate class. This was the last major patch I had in mind for this part of the code. /Albert From 7211e99bd48018c78a96cdc817b1c3de515c3e83 Mon Sep 17 00:00:00 2001 From: Albert Thuswaldner albert.thuswald...@gmail.com Date: Thu, 12 Apr 2012 21:20:58 +0200 Subject: [PATCH] Moved ScDefaultsOptions from ScDocOptions to separate class --- sc/Library_sc.mk|1 + sc/inc/defaultsopt.hxx | 104 + sc/inc/docoptio.hxx | 17 +--- sc/inc/sc.hrc |1 + sc/inc/scmod.hxx|5 + sc/source/core/data/document.cxx| 14 +- sc/source/core/tool/defaultsopt.cxx | 209 +++ sc/source/core/tool/docoptio.cxx| 78 +- sc/source/ui/app/scmod.cxx | 40 +++ sc/source/ui/inc/tpdefaults.hxx | 15 +-- sc/source/ui/optdlg/tpdefaults.cxx | 47 + sc/source/ui/view/tabvwsh4.cxx |6 +- 12 files changed, 403 insertions(+), 134 deletions(-) create mode 100644 sc/inc/defaultsopt.hxx create mode 100644 sc/source/core/tool/defaultsopt.cxx diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index f640f05..d2c32cd 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -171,6 +171,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/core/tool/consoli \ sc/source/core/tool/dbdata \ sc/source/core/tool/ddelink \ + sc/source/core/tool/defaultsopt \ sc/source/core/tool/detdata \ sc/source/core/tool/detfunc \ sc/source/core/tool/docoptio \ diff --git a/sc/inc/defaultsopt.hxx b/sc/inc/defaultsopt.hxx new file mode 100644 index 000..6dec5b0 --- /dev/null +++ b/sc/inc/defaultsopt.hxx @@ -0,0 +1,104 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the License); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an AS IS basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Initial Developer of the Original Code is + * Albert Thuswaldner albert.thuswald...@gmail.com + * Portions created by the Initial Developer are Copyright (C) 2012 the + * Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 3 or later (the GPLv3+), or + * the GNU Lesser General Public License Version 3 or later (the LGPLv3+), + * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable + * instead of those above. + */ + +#ifndef SC_DEFAULTSOPT_HXX +#define SC_DEFAULTSOPT_HXX + +#include svl/poolitem.hxx +#include unotools/configitem.hxx +#include formula/grammar.hxx +#include scdllapi.h +#include global.hxx + +class SC_DLLPUBLIC ScDefaultsOptions +{ +private: +SCTAB nInitTabCount; // number of Tabs for new Spreadsheet doc +::rtl::OUString aInitTabPrefix; // The Tab prefix name in new Spreadsheet doc + + +public: +ScDefaultsOptions(); +ScDefaultsOptions( const ScDefaultsOptions rCpy ); +~ScDefaultsOptions(); + +void SetDefaults(); + +SCTAB GetInitTabCount() const { return nInitTabCount; } +void SetInitTabCount( SCTAB nTabs) { nInitTabCount = nTabs; } +void SetInitTabPrefix( ::rtl::OUString aPrefix) { aInitTabPrefix = aPrefix; } +::rtl::OUString GetInitTabPrefix() const { return aInitTabPrefix; } + +ScDefaultsOptions operator= ( const ScDefaultsOptions rCpy ); +booloperator== ( const ScDefaultsOptions rOpt ) const; +booloperator!= ( const ScDefaultsOptions rOpt ) const; + +}; + +//== +// item for the dialog / options page +//== + +class SC_DLLPUBLIC ScTpDefaultsItem : public SfxPoolItem +{ +public: +TYPEINFO(); +ScTpDefaultsItem( sal_uInt16 nWhich, + const ScDefaultsOptions rOpt ); +ScTpDefaultsItem( const ScTpDefaultsItem rItem ); +~ScTpDefaultsItem(); + +virtual String GetValueText() const; +virtual int operator==( const SfxPoolItem ) const; +virtual SfxPoolItem*Clone( SfxItemPool *pPool = 0 ) const; + +const ScDefaultsOptions GetDefaultsOptions() const { return theOptions; } + +private: +ScDefaultsOptions theOptions; +}; +
Re: what exactly needs localedata_en library ?
On 04/12/2012 04:14 PM, Eike Rathke wrote: On Thursday, 2012-04-12 13:33:38 +0200, Lubos Lunak wrote: As far as I can see, it is the i18npool library that dlopens localedata_en (i18npool/source/localedata/localedata.cxx), so I think the best way to express this dependency is to make i18npool depend on localedata_en (and localedata_es, localedata_euro and localedata_others). Might be an approach. While at it, dependencies on the various libdict_* and lib*_data* that are dlopen'ed by i18npool could be added as well. ...as long as it does not take away too much opportunity for parallelization... Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Convert macro to local const var
On Thu, Apr 12, 2012 at 2:10 PM, Philipp Weissenbacher p.weissenbac...@gmail.com wrote: Hi! The following patch a locally used macro to a local const variable. I didn't compile, because my laptop is too slow for that. I'm curious... what's the benefit of that ? Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Compile failed on master Debian in tail_build
Hello, On pc Debian x86-64, compilation failed on tail_build with this error : [ build LNK ] Library/libsdlo.so /home/julien/compile-libreoffice/libo/workdir/unxlngx6/CxxObject/sd/source/ui/func/fuediglu.o: file not recognized: File truncated collect2: ld returned 1 exit status make[1]: *** [/home/julien/compile-libreoffice/libo/workdir/unxlngx6/LinkTarget/Library/libsdlo.so] Erreur 1 make: *** [tail_build] Erreur 2 I runned a make clean make this morning, I've got still the same. Here are some details of my config : --enable-binfilter --with-system-boost --with-system-odbc --enable-ext-mysql-connector --with-system-mysql --enable-symbols --enable-ext-barcode --enable-ext-diagram --enable-ext-google-docs --enable-ext-hunart --enable-ext-nlpsolver --enable-ext-ct2n --enable-ext-numbertext --enable-ext-oooblogger --enable-ext-pdfimport --enable-postgresql-sdbc --enable-ext-presenter-console --enable-ext-presenter-minimizer --enable-ext-report-builder --enable-ext-scripting-beanshell --enable-ext-scripting-javascript --enable-ext-typo --enable-ext-validator --enable-ext-watch-window --enable-ext-wiki-publisher --enable-dbus --enable-graphite --enable-evolution2 --enable-werror --enable-debug --enable-dbgutil --enable-crashdump --enable-kde4 --enable-dependency-tracking --enable-online-update Boost 1.49, gcc (Debian 4.6.3-1) 4.6.3, GNU Make 3.81) Since Linux master Tinderboxes seem ok, I suppose I missed something but what ? Any idea ? /tmp is used to 1% only and /home only 31% Julien. -- View this message in context: http://nabble.documentfoundation.org/Compile-failed-on-master-Debian-in-tail-build-tp3906437p3906437.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Compile failed on master Debian in tail_build
On 12 April 2012 22:51, julien2412 serval2...@yahoo.fr wrote: [ build LNK ] Library/libsdlo.so /home/julien/compile-libreoffice/libo/workdir/unxlngx6/CxxObject/sd/source/ui/func/fuediglu.o: file not recognized: File truncated maybe the error is somewhere higher ? rm /home/julien/compile-libreoffice/libo/workdir/unxlngx6/CxxObject/sd/source/ui/func/fuediglu.o cd sd make -r what happens ? -- Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: my contributions.
Hi Mark, On Thu, Apr 12, 2012 at 03:11:08PM -0400, Mark Wolf mark.wolf.mu...@gmail.com wrote: At the suggestion of others... All my contributions, past and future, to LibreOffice are licensed under the terms of the MPL / LGPLv3+. Thanks, added to https://wiki.documentfoundation.org/Development/Developers Miklos ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Compile failed on master Debian in tail_build
On Thu, Apr 12, 2012 at 01:51:56PM -0700, julien2412 wrote: Hello, On pc Debian x86-64, compilation failed on tail_build with this error : [ build LNK ] Library/libsdlo.so /home/julien/compile-libreoffice/libo/workdir/unxlngx6/CxxObject/sd/source/ui/func/fuediglu.o: file not recognized: File truncated collect2: ld returned 1 exit status make[1]: *** [/home/julien/compile-libreoffice/libo/workdir/unxlngx6/LinkTarget/Library/libsdlo.so] Erreur 1 make: *** [tail_build] Erreur 2 I get that too but for sw and grfshex.cxx. Interestingly, the .o is 0 bytes... Reproducably. Without compiler error. See e.g. http://zyklop.dyndns.org/~rene/grfshex.log Regatds, Rene ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH][REVIEW] gbuild conversion: idlc module
Hi David, hi Matus, thank you for your comments on my patch. I changed it accordingly. *@Matúš:* thank you for your help on IRC. Special usage gnu_getopt lib in windows: Matúš proposed the follow simple solution to include in Executable_idlcpp.mk: ifeq ($(OS),WNT) $(eval $(call gb_Executable_use_libraries,idlcpp,\ gnu_getopt \ )) endif because 1. HAVE_GETOPT is allways NO on windows 2. gnu_getopt is registered already on windows: gb_Library_PLAINLIBS_NONE += [...] gnu_getopt [...] here solenv/gbuild/platform/WNT_INTEL_GCC.mk and here solenv/gbuild/platform/WNT_INTEL_MSC.mk 3. original make file snippet was only active on windows .IF $(HAVE_GETOPT) != YES .IF $(GUI)$(COM) == WNTMSC APP1STDLIBS=gnu_getopt.lib .ELIF $(GUI)$(COM) == WNTGCC APP1STDLIBS=-lgnu_getopt .ENDIF .ENDIF Having said that, how could we simplify the gnu_getopt treatment in tools/Executable_rscdep.mk? David Original Message Subject:Re: [PATCH][REVIEW] gbuild conversion: idlc module Date: Thu, 12 Apr 2012 06:33:19 +0200 From: David Tardon dtar...@redhat.com To: David Ostrovsky david.ostrov...@gmx.de CC: Libreoffice-dev libreoffice@lists.freedesktop.org On Wed, Apr 11, 2012 at 11:18:46PM +0200, David Ostrovsky wrote: Hi, this is gbuild conversion for idlc module. Good. But it is not quite ready yet, see comments below. diff --git a/Repository.mk b/Repository.mk index 1a3851e..638f4f8 100644 --- a/Repository.mk +++ b/Repository.mk @@ -31,6 +31,8 @@ $(eval $(call gb_Helper_register_executables,NONE, \ bmp \ bmpsum \ cppunit/cppunittester \ +idlc \ +idlcpp \ g2g \ gencoll_rule \ genconv_dict \ Both binaries should be registered in layer SDKBIN (because of APP1RPATH=SDK). + +$(eval $(call gb_Executable_use_libraries,idlc,\ +sal \ +reg \ Originally idlc is linked with salhelper too. It is possible it is no longer necessary, but it is also possible that it is necessary on a different platform. (Nitpick: please, keep the libs sorted alphabetically :-) +)) +$(eval $(call gb_Executable_use_linked_libs,idlcpp,\ +gnu_getopt \ +)) This is wrong: there is no unconditionally built library gnu_getopt. It only worked for you because there is no function gb_Executable_use_linked_libs either (it is called gb_Executable_use_libraries) and your platform's libc has getopt .-) You need to use gb_Executable_use_externals and add a new definition to RepositoryExternals.mk for it, like: ifeq ($(HAVE_GETOPT),YES) # nothing needed define gb_LinkTarget__use_gnu_getopt endef else # !HAVE_GETOPT define gb_LinkTarget__use_gnu_getopt $(call gb_LinkTarget_use_libraries,$(1),\ gnu_getopt \ ) endef $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE,\ gnu_getopt \ )) endif # HAVE_GETOPT D. From 546ac819c641a7a2d3b0b9ef243adff191abd7b7 Mon Sep 17 00:00:00 2001 From: David Ostrovsky david.ostrov...@gmx.de Date: Fri, 6 Apr 2012 01:51:05 +0200 Subject: [PATCH] gbuild conversion: idlc module --- Makefile|2 +- Repository.mk |5 ++ RepositoryModule_ooo.mk |1 + idlc/CustomTarget_scanner.mk| 39 idlc/Executable_idlc.mk | 75 +++ idlc/Executable_idlcpp.mk | 46 ++ idlc/Makefile |7 ++ idlc/Module_idlc.mk | 36 +++ idlc/prj/build.lst |4 +- idlc/prj/d.lst |7 -- idlc/prj/makefile.mk|1 + idlc/source/makefile.mk | 124 --- idlc/source/preproc/makefile.mk | 77 13 files changed, 212 insertions(+), 212 deletions(-) create mode 100644 idlc/CustomTarget_scanner.mk create mode 100644 idlc/Executable_idlc.mk create mode 100644 idlc/Executable_idlcpp.mk create mode 100644 idlc/Makefile create mode 100644 idlc/Module_idlc.mk create mode 100644 idlc/prj/makefile.mk delete mode 100644 idlc/source/makefile.mk delete mode 100644 idlc/source/preproc/makefile.mk diff --git a/Makefile b/Makefile index 865a324..7993cff 100644 --- a/Makefile +++ b/Makefile @@ -67,6 +67,7 @@ i18npool\ i18nutil\ idl\ io\ +idlc\ javaunohelper\ jurt\ jvmaccess\ @@ -176,7 +177,6 @@ hunspell\ hyphen\ icc\ icu\ -idlc\ instsetoo_native\ jfreereport\ jpeg\ diff --git a/Repository.mk b/Repository.mk index 1a3851e..2bf19b6 100644 --- a/Repository.mk +++ b/Repository.mk @@ -53,6 +53,11 @@ $(eval $(call gb_Helper_register_executables,NONE, \ xpdfimport \ )) +$(eval $(call gb_Helper_register_executables,SDK, \ +idlc \ +idlcpp \ +)) + $(eval $(call gb_Helper_register_executables,OOO, \ spadmin.bin \ $(if $(filter $(GUIBASE)$(ENABLE_KDE),unxTRUE), \ diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index a79028c..ea5d5ab 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -67,6 +67,7 @@
Re: [PATCH] Convert macro to local const var
Not so much, I have to admit. Though, I thought less macros are always A Good Thing(tm). Philipp On 12 April 2012 22:16, Norbert Thiebaud nthieb...@gmail.com wrote: On Thu, Apr 12, 2012 at 2:10 PM, Philipp Weissenbacher p.weissenbac...@gmail.com wrote: Hi! The following patch a locally used macro to a local const variable. I didn't compile, because my laptop is too slow for that. I'm curious... what's the benefit of that ? Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Need LO3.6 Windows build for Hackfest
Hi Hackfest participants, I have build a LO 3.6 on WinXP. It installs fine on my WinXP PC. But installation fails on my Netbook with Windows 7 starter. Perhaps my build is not totally OK. Can someone provide an actual Windows build of LO3.6, so that I can try to install it on my Netbook on the Hackfest? Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Need LO3.6 Windows build for Hackfest
2012/4/13 Regina Henschel rb.hensc...@t-online.de: Hi Hackfest participants, I have build a LO 3.6 on WinXP. It installs fine on my WinXP PC. But installation fails on my Netbook with Windows 7 starter. Perhaps my build is not totally OK. Can someone provide an actual Windows build of LO3.6, so that I can try to install it on my Netbook on the Hackfest? Have you ever installed LibreOffice on that netbook? It may be an installer bug, not a problem with your build. Best regards, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build Failure on Cygwin Windows
Hi Johnny, On 12 April 2012 07:31, Johnny Chen johnny...@gmail.com wrote: Hi, I am new to LibreOffice, so sorry for any dumb questions. Welcome here. And don't worry about questions. The build went on for an hour or so until it failed.The problems seem to be within the xml2cmp and clucene modules. That's because they are first modules with gbuild building system. LINK : fatal error LNK1104: cannot open file 'c:/cygwinc:/cygwin/home/Johnny/libo/workdir/wntmsci12.pro/CxxObject/xml2cmp/source/xcd/main.o' Does anyone have any idea what may have caused this? It's most probably because you have LibreOffice sources in /home. I would think it works by now but obviously not. Maybe I will investigate why later. Sorry for this, preferred way is to have sources in C:/Libo or one directory lower but not too much. I have C:/Git/Libo and I don't know which Makefile is calling the link command. It's http://cgit.freedesktop.org/libreoffice/core/tree/solenv/gbuild/platform/WNT_INTEL_MSC.mk#n338 :) Another newbie question is this: why did we not terminate the build earlier if xml2cmp failed? I don't know, the script used is: solenv/bin/build.pl But that's not necessary bad because you don't need to build what already is. Windows tinderboxes are green [1], so hopefully you will get your build soon. All the best, Matus [1] http://tinderbox.libreoffice.org/MASTER/status.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Weird error during build of 3.5.2 libreoffice
Hi guys, I am kinda unable to figure what is the dmake complaining about. dmake: /var/tmp/portage/app-office/libreoffice-3.5.2.2/work/libreoffice-core-3.5.2.2/solenv/inc/tg_ext.mk: line 106: Error: -- A %-target must not be mixed with non-%-targets, offending target [glibc-omitfp/%.unpack] Complete log: https://401507.bugs.gentoo.org/attachment.cgi?id=300617 Any ideas? Cheers Tom ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH][REVIEW] gbuild conversion: idlc module
On 12 April 2012 06:33, David Tardon dtar...@redhat.com wrote: Originally idlc is linked with salhelper too. It is possible it is no longer necessary, but it is also possible that it is necessary on a different platform. salhelper is often needed only for Windows. ifeq ($(HAVE_GETOPT),YES) # nothing needed Maybe also $(call gb_LinkTarget_add_defs,$(1),\ -DHAVE_GETOPT \ ) so it could be used here: http://opengrok.libreoffice.org/xref/core/tools/Executable_rscdep.mk#59 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE,\ gnu_getopt \ )) It is already registered in solenv/gbuild/platform/ This whole getopt thing is windows only (I wonder if it is still relevant ? maybe yes) So we need to write ifeq ($(OS),WNT) either to RepositoryExternal or to makefiles. Best, Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: feature/gbuild_components is finished
On 04/02/2012 09:03 AM, David Tardon wrote: it would be nice if people tried feature/gbuild_components on their Windows or MacOS X machines/tinderboxes. It builds and smoketest runs on Linux and Linux/MinGW, so I do not expect problems, but anyway .-) Just FYI, my local Mac OS X build started to fail now in a bizarre way, claiming it cannot find type description for com.sun.star.lang.XUnoTunnel (but apparently being able to find type descriptions for other types) as soon as it executes CppUnit tests like sd_uimpress. Smells like it has to do with the UnoApi changes, but it is still completely unclear to me what's going wrong there. Strange that tinderboxes like MacOSX-Intel_1-built_no-moz_on_10.6.8 apparently do not have that problem; maybe it has to do with my --enable-dbgutil and the resulting non-optimization. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH][REVIEW] gbuild conversion: idlc module
Hi David, On 11 April 2012 23:18, David Ostrovsky david.ostrov...@gmx.de wrote: this is gbuild conversion for idlc module. nice We don't have lexer function for gbuild, so I converted dmake stuff directly in CustomTarget_scanner.mk. With http://cgit.freedesktop.org/libreoffice/core/commit/?id=0a45deba2be4a77db7540bd050b25bd6c26d7513 gb_CustomTarget_CustomTarget takes only one parameter. +DESO := $(call gb_CustomTarget_get_workdir,idlc/scanner) DESO from desktop/CustomTarget_soffice.mk is shortcut from desktop - soffice. You should come up with unique name for a variable, preferably 2 letters somehow derived from module and 2 from custom target. Well, it does not really matter, this is how I was doing that, It's just that all makefiles are included and processed by make, so better to keep names different. Maybe also + flex -o$(DESO)/scanner.cxx $(DESO)/stripped_scanner.ll could be + flex -o$@ $ so when you are changing targets somehow you can keep the rule but that's just detail. Otherwise it looks good. @Matus, thank you for your help on IRC with that. No problem, there are also more people who would help you, you just need to ask. Thanks, Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: feature/gbuild_components is finished
Just FYI, my local Mac OS X build started to fail now in a bizarre way, claiming it cannot find type description for com.sun.star.lang.XUnoTunnel Weird, I have seen some messages about that same type in the iOS build when running the sc_filters_test unit test, like some weeks ago. A coincidence? Or is XUnoTunnel the first type that is used in a certain way, or something? (Dare I ask What *is* XUnoTunnel anyway?) --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Pushed] Easy Hack Bug No. 42982
On 04/11/2012 09:20 PM, Abeer Sethi wrote: I'm attaching the patch for namecont.cxx, I hope this is the correct way to go about it. If yes, I have another patch ready for another file. diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index a9307d2..4142ef3 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -300,7 +300,7 @@ void SAL_CALL NameContainer::addContainerListener( const Reference XContainerLi throw (RuntimeException) { if( !xListener.is() ) -throw RuntimeException(); +throw RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XListener is not equal to 1)), static_cast cppu::OWeakObject * (this)); XListener is not equal to 1 is probably more confusing than no message at all. ;) Something like addContainerListener called with null xListener might be more useful. (And, as Christina already pointed out, some very recent changes on master now make it possible to leave out the rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(...)) boilerplate.) Stephan Reference XInterface xIface( xListener, UNO_QUERY ); maContainerListeners.addInterface( xIface ); } ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Updating the documentation in the IDL files?
On 04/11/2012 09:27 PM, Tor Lillqvist wrote: OK... Those indeed help. So XComponent is an interface to be added to types that might have circular references? Yes, see http://www.openoffice.org/udk/common/man/lifecycle.html. (And, of course, the interface is badly named. Something like XDisposable might have been a better choice.) When for instance Frame.idl talks about components, does it mean the XComponent kind of component, or component in some other meaning? The problem with component is that it is such a nice, generic term... Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: feature/gbuild_components is finished
On 04/12/2012 09:10 AM, Tor Lillqvist wrote: Just FYI, my local Mac OS X build started to fail now in a bizarre way, claiming it cannot find type description for com.sun.star.lang.XUnoTunnel Weird, I have seen some messages about that same type in the iOS build when running the sc_filters_test unit test, like some weeks ago. A coincidence? Or is XUnoTunnel the first type that is used in a certain way, or something? XUnoTunnel is one of the types for which stoc generates non-default cppumaker headers (i.e., not calling cppumaker with the default -L argument), so problems of properly confining symbols to libraries can expose ODR violations (and I remember that we already had that problem recently; need to look up the details again). (Dare I ask What *is* XUnoTunnel anyway?) The documentation in the IDL file should explain it. Stpehan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: 'make check' with Windows/MSVC build?
On 2012-04-11 18:19, Stephan Bergmann wrote: My understanding is that we use classic paths (not starting with \\?) whenever they are short enough, anyway. So the problem cannot be solved with an #if, but (short of abandoning berkeleydb) needs to be worked around by making sure the LO installation is in a location with a short path (so that the paths of any files within the installation that are handed to berkeleydb are also short). git grep db_create says there 5 places within LO where we hand a path to berkelydb. Perhaps in that place we can convert to a 8.3 using the Win32 API GetShortPathName. Or we could unconditionally convert to a very long path (using \\?) ? -- Noel Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: make check problem in libtest_smoketest building master
On 04/12/2012 09:49 AM, Noel Grandin wrote: On 2012-04-11 16:29, Stephan Bergmann wrote: Looks like the dynamic loader on your system does not support dlsym to report a symbol not exported by the lib itself, but only indirectly by a lib the first lib links against. Darn, I would have thought that by now pretty much all Linux's had the same dynamic loader. Please find out whether the assumption is correct (see Lubos' mail on LD_DEBUG). Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: 'make check' with Windows/MSVC build?
On 04/12/2012 10:00 AM, Noel Grandin wrote: On 2012-04-11 18:19, Stephan Bergmann wrote: My understanding is that we use classic paths (not starting with \\?) whenever they are short enough, anyway. So the problem cannot be solved with an #if, but (short of abandoning berkeleydb) needs to be worked around by making sure the LO installation is in a location with a short path (so that the paths of any files within the installation that are handed to berkeleydb are also short). git grep db_create says there 5 places within LO where we hand a path to berkelydb. Perhaps in that place we can convert to a 8.3 using the Win32 API GetShortPathName. Or we could unconditionally convert to a very long path (using \\?) ? My understanding is that berkeleydb does not accept \\? style paths. But feel free to experiment. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Difference between X(Synchrnonous)FrameLoader and XComponentLoader?
XFrameLoader / XSynchronousFrameLoader are interfaces for 'loading of the specified resource [which apparently can mean document] into the specified Frame' (asynchrnously or synchronously). XComponentLoader is an interface to 'load components [and based on how it is used in sample code, component here can mean document] by an URL into a frame environment'. What's the difference? --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: make check problem in libtest_smoketest building master
On 2012-04-12 10:22, Stephan Bergmann wrote: Please find out whether the assumption is correct (see Lubos' mail on LD_DEBUG). I tried LD_DEBUG=symbols make check but it produced so much output it seems to have broken the build - it eventually froze up during a link step. How do I run just the failing test? Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: make check problem in libtest_smoketest building master
On 04/12/2012 10:30 AM, Noel Grandin wrote: On 2012-04-12 10:22, Stephan Bergmann wrote: Please find out whether the assumption is correct (see Lubos' mail on LD_DEBUG). I tried LD_DEBUG=symbols make check but it produced so much output it seems to have broken the build - it eventually froze up during a link step. How do I run just the failing test? cd smoketest make -n /home/noel/libo/workdir/unxlngx6.pro/CppunitTest/smoketest.test will display the command line to run the test (following a line [ build CUT ] smoketest), starting with S=... O=... W=... mkdir -p ... (LD_LIBRARY_PATH= Copy that mumbo-jumbo, stick LD_DEBUG=symbols between ( and LD_LIBRARY_PATH= and run that. The output will be captured in /home/noel/libo/workdir/unxlngx6.pro/CppunitTest/smoketest.test.log. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Trying to solve a crasher in editeng unit test
On 04/11/2012 10:44 PM, Kohei Yoshida wrote: On Wed, 2012-04-11 at 21:29 +0100, Caolán McNamara wrote: On Wed, 2012-04-11 at 15:56 -0400, Kohei Yoshida wrote: Hey there, I'm trying to set up a new unit test for the edit engine core, but struggling with one crasher. http://cgit.freedesktop.org/libreoffice/core/commit/?id=6089be1a7a17ae849d8793520e9d8d36296ed5cf should get you closer anyway, and into a more mundane crash with SfxItemPools Thanks a lot. This helps. Hopefully any fix of yours will also fix the following problem: My local --enable-dbgutil make check build keeps failing with a crash in sw_subsequent_rtftok. Valgrind gives ==32152== Invalid read of size 8 ==32152==at 0x12DC7689: SfxItemPool::GetDefaultItem(unsigned short) const (/svl/source/items/itempool.cxx:874) ==32152==by 0x12DC6058: SfxItemPool::Put(SfxPoolItem const, unsigned short) (/svl/source/items/itempool.cxx:681) ==32152==by 0x12DC5E44: SfxItemPool::Put(SfxPoolItem const, unsigned short) (/svl/source/items/itempool.cxx:663) ==32152==by 0x12DDD519: SfxItemSet::Put(SfxPoolItem const, unsigned short) (/svl/source/items/itemset.cxx:609) ==32152==by 0x213CB7E5: SfxItemSet::Put(SfxPoolItem const) (/solver/unxlngx6/inc/svl/itemset.hxx:150) ==32152==by 0x214DDDA4: sdr::properties::TextProperties::ForceDefaultAttributes() (/svx/source/sdr/properties/textproperties.cxx:384) ==32152==by 0x214DBC82: sdr::properties::DefaultProperties::GetObjectItemSet() const (/svx/source/sdr/properties/defaultproperties.cxx:94) ==32152==by 0x215A02D1: SdrObject::GetObjectItemSet() const (/svx/source/svdraw/svdobj.cxx:1981) ==32152==by 0x215FB757: SdrTextObj::GetTextLeftDistance() const (/svx/source/svdraw/svdotext.cxx:1792) ==32152==by 0x2161D645: SdrTextObj::NbcResize(Point const, Fraction const, Fraction const) (/svx/source/svdraw/svdotxtr.cxx:125) ==32152==by 0x215ED66E: SdrPathObj::NbcResize(Point const, Fraction const, Fraction const) (/svx/source/svdraw/svdopath.cxx:2370) ==32152==by 0x215EDF95: SdrPathObj::NbcSetSnapRect(Rectangle const) (/svx/source/svdraw/svdopath.cxx:2466) ==32152==by 0x2159F3A1: SdrObject::SetSnapRect(Rectangle const) (/svx/source/svdraw/svdobj.cxx:1687) ==32152==by 0x217086D4: SvxDrawPage::_CreateSdrObject(com::sun::star::uno::Referencecom::sun::star::drawing::XShape const) (/svx/source/unodraw/unopage.cxx:518) ==32152==by 0x2185BF74: SvxFmDrawPage::_CreateSdrObject(com::sun::star::uno::Referencecom::sun::star::drawing::XShape const) (/svx/source/form/fmdpage.cxx:102) ==32152==by 0x1F39D352: SwFmDrawPage::_CreateSdrObject(com::sun::star::uno::Referencecom::sun::star::drawing::XShape const) (/sw/source/core/unocore/unodraw.cxx:333) ==32152==by 0x21709CEF: SvxDrawPage::CreateSdrObject(com::sun::star::uno::Referencecom::sun::star::drawing::XShape const) (/svx/source/unodraw/unopage.cxx:850) ==32152==by 0x217071B0: SvxDrawPage::add(com::sun::star::uno::Referencecom::sun::star::drawing::XShape const) (/svx/source/unodraw/unopage.cxx:246) ==32152==by 0x1F39ED4F: SwXDrawPage::add(com::sun::star::uno::Referencecom::sun::star::drawing::XShape const) (/sw/source/core/unocore/unodraw.cxx:630) ==32152==by 0x255DA9D7: writerfilter::rtftok::RTFDocumentImpl::popState() (/writerfilter/source/rtftok/rtfdocumentimpl.cxx:3299) ==32152==by 0x25614308: writerfilter::rtftok::RTFTokenizer::resolveParse() (/writerfilter/source/rtftok/rtftokenizer.cxx:110) ==32152==by 0x255C4960: writerfilter::rtftok::RTFDocumentImpl::resolve(writerfilter::Stream) (/writerfilter/source/rtftok/rtfdocumentimpl.cxx:548) ==32152==by 0x231E0722: RtfFilter::filter(com::sun::star::uno::Sequencecom::sun::star::beans::PropertyValue const) (/writerfilter/source/filter/RtfFilter.cxx:99) ==32152==by 0x1C359018: SfxObjectShell::ImportFrom(SfxMedium, bool) (/sfx2/source/doc/objstor.cxx:2238) ==32152==by 0x1C351224: SfxObjectShell::DoLoad(SfxMedium*) (/sfx2/source/doc/objstor.cxx:730) ==32152==by 0x1C39E867: SfxBaseModel::load(com::sun::star::uno::Sequencecom::sun::star::beans::PropertyValue const) (/sfx2/source/doc/sfxbasemodel.cxx:1900) ==32152==by 0x1C3EC76C: SfxFrameLoader_Impl::load(com::sun::star::uno::Sequencecom::sun::star::beans::PropertyValue const, com::sun::star::uno::Referencecom::sun::star::frame::XFrame const) (/sfx2/source/view/frmload.cxx:611) ==32152==by 0x1A9C5EC5: framework::LoadEnv::impl_loadContent() (/framework/source/loadenv/loadenv.cxx:1160) ==32152==by 0x1A9C2696: framework::LoadEnv::startLoading() (/framework/source/loadenv/loadenv.cxx:418) ==32152==by 0x1A9C150C: framework::LoadEnv::loadComponentFromURL(com::sun::star::uno::Referencecom::sun::star::frame::XComponentLoader const, com::sun::star::uno::Referencecom::sun::star::lang::XMultiServiceFactory const, rtl::OUString const, rtl::OUString const, int, com::sun::star::uno::Sequencecom::sun::star::beans::PropertyValue const)
Re: make check problem in libtest_smoketest building master
Stephan Bergmann píše v St 11. 04. 2012 v 16:29 +0200: On 04/11/2012 02:24 PM, Noel Grandin wrote: Building on Ubuntu 64-bit, make check is failing because of a missing symbol in libtest_smoketest.so. Doing a make smoketest.clean doesn't seem to help. The library does genuinely seem to be missing the symbol (readelf log attached). In the case of smoketest, the lib containing cppunitTestPlugIn is not libtest_smoketest.so but libsmoketest.so (where the former links against the latter). The reason for that appears to be http://cgit.freedesktop.org/libreoffice/core/commit/?id=8c478c911033243df90ba290b32732a1fd70130e create installation set for tests. (Petr, does that feature still work, after gbuild'ification of smoketest?) I haven't tested it after gbuild'fication. I do not work much with master this time :-( Looks like the dynamic loader on your system does not support dlsym to report a symbol not exported by the lib itself, but only indirectly by a lib the first lib links against. I wonder if it might be related to --as-needed linker option. It caused similar troubles when enabled on openSUSE linker by default. Of course, it is more likely broken by gbuild'ification. I wonder if Matúš could have a look at it. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW:3-5] fdo#45182 fix RTF import of character encoding in footnotes
Hi, See http://cgit.freedesktop.org/libreoffice/core/commit/?id=f4e0cba I'm attaching a backport of the fix for 3-5. Thanks, Miklos From d547ff471039d8d3847839d6d26a0af7bdba9b17 Mon Sep 17 00:00:00 2001 From: Miklos Vajna vmik...@suse.cz Date: Tue, 3 Apr 2012 16:49:41 +0200 Subject: [PATCH] fdo#45182 fix RTF import of character encoding in footnotes There were two problems here: 1) \plain reset the character properties, but did not touch the current encoding 2) the default properties were not passed to substreams --- writerfilter/source/rtftok/rtfdocumentimpl.cxx | 17 +++-- writerfilter/source/rtftok/rtfdocumentimpl.hxx |2 ++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index a117ec6..1a7f8b9 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -569,6 +569,14 @@ int RTFDocumentImpl::getFontIndex(int nIndex) return m_pSuperstream-getFontIndex(nIndex); } +RTFParserState RTFDocumentImpl::getDefaultState() +{ +if (!m_pSuperstream) +return m_aDefaultState; +else +return m_pSuperstream-getDefaultState(); +} + void RTFDocumentImpl::resolve(Stream rMapper) { m_pMapperStream = rMapper; @@ -1763,8 +1771,13 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) m_aStates.top().nCurrentEncoding = RTL_TEXTENCODING_MS_1252; break; case RTF_PLAIN: -m_aStates.top().aCharacterSprms = m_aDefaultState.aCharacterSprms; -m_aStates.top().aCharacterAttributes = m_aDefaultState.aCharacterAttributes; +{ +m_aStates.top().aCharacterSprms = getDefaultState().aCharacterSprms; +RTFValue::Pointer_t pValue = m_aStates.top().aCharacterSprms.find(NS_sprm::LN_CRgFtc0); +if (pValue.get()) +m_aStates.top().nCurrentEncoding = getEncoding(pValue-getInt()); +m_aStates.top().aCharacterAttributes = getDefaultState().aCharacterAttributes; +} break; case RTF_PARD: m_aStates.top().aParagraphSprms = m_aDefaultState.aParagraphSprms; diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx index 461b88e..676d75e 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx @@ -369,6 +369,8 @@ namespace writerfilter { int getFontIndex(int nIndex); /// Return the encoding associated with a dmapper font index. rtl_TextEncoding getEncoding(sal_uInt32 nFontIndex); +/// Get the default parser state. +RTFParserState getDefaultState(); private: SvStream Strm(); -- 1.7.7 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
new tinderbox at my company
Hi So finally (about 3 months later than expected) I've got the tinderbox I promised up and running at my company (Peralex). It's a Windows7-64 machine, 6 CPU cores, 16G of RAM. What do I need to do to get it included into the official tinderbox results? (assuming that would be a useful thing). There is quite a lot of memory free, so I could quite easily run a VM and do another tinderbox inside that (Ubuntu perhaps?) Also, if it would be more useful for me to be building something other than MASTER, let me know. Regards, Noel Grandin Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: make check problem in libtest_smoketest building master
On 04/12/2012 11:05 AM, Petr Mladek wrote: Stephan Bergmann píše v St 11. 04. 2012 v 16:29 +0200: Looks like the dynamic loader on your system does not support dlsym to report a symbol not exported by the lib itself, but only indirectly by a lib the first lib links against. I wonder if it might be related to --as-needed linker option. It caused similar troubles when enabled on openSUSE linker by default. Sounds plausible. Just asked Noel for readelf -d output for verification. I would consider an ld that assumes --as-needed per default as broken. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Pushed] Easy Hack Bug No. 42982
On 11/04/12 21:20, Abeer Sethi wrote: I'm attaching the patch for namecont.cxx, I hope this is the correct way to go about it. If yes, I have another patch ready for another file. Thanking You, Abeer Sethi. hello Abeer, thanks for sending this patch. but in addition to the points that Stephan raised, there are some things you could improve: first, the subject of the mail contains [Pushed], but that is the tag used to indicate that a patch has been integrated. if you send a patch to the list for others to review, then you should use the [PATCH] tag instead. second, the subject of the attached patch: Subject: [PATCH] Author: Abeer Sethi (abeerse...@gmail.com) Date: Thur Apr 12 00:29 2012 +0530 Fixes bug 42982 please refer to freedesktop.org bugs with the notation fdo#42982. also, you do not need to include the author or date in the subject line, as you can see git already automatically adds special headers that include this data: From: Abeer Sethi abeersethi...@gmail.com Date: Thu, 12 Apr 2012 00:28:10 +0530 please try again by send a new patch with the raised points corrected :) regards, michael ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: make check problem in libtest_smoketest building master
On 04/12/2012 10:48 AM, Noel Grandin wrote: Output attached. [...] 10709: symbol=dlsym; lookup in file=/lib/x86_64-linux-gnu/libdl.so.2 [0] 10709: symbol=cppunitTestPlugIn; lookup in file=/home/noel/libo/workdir/unxlngx6.pro/LinkTarget/CppunitTest/libtest_smoketest.so [0] 10709: symbol=cppunitTestPlugIn; lookup in file=/lib/x86_64-linux-gnu/libc.so.6 [0] 10709: symbol=cppunitTestPlugIn; lookup in file=/lib64/ld-linux-x86-64.so.2 [0] 10709: /home/noel/libo/workdir/unxlngx6.pro/LinkTarget/CppunitTest/libtest_smoketest.so: error: symbol lookup error: undefined symbol: cppunitTestPlugIn (fatal) My output (Fedora 16) there is 4333: symbol=dlsym; lookup in file=/lib64/libdl.so.2 [0] 4333: symbol=cppunitTestPlugIn; lookup in file=/data/lo/core/workdir/unxlngx6/LinkTarget/CppunitTest/libtest_smoketest.so [0] 4333: symbol=cppunitTestPlugIn; lookup in file=/data/lo/core/solver/unxlngx6/lib/libcppunit-1.12.so.1 [0] 4333: symbol=cppunitTestPlugIn; lookup in file=/data/lo/core/solver/unxlngx6/lib/libsmoketest.so [0] What is the output of readelf -d workdir/unxlngx6.pro/LinkTarget/CppunitTest/libtest_smoketest.so for you? Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: make check problem in libtest_smoketest building master
On 2012-04-12 11:51, Stephan Bergmann wrote: What is the output of readelf -d workdir/unxlngx6.pro/LinkTarget/CppunitTest/libtest_smoketest.so for you? Output attached. Disclaimer: http://www.peralex.com/disclaimer.html noel@ubuntu:~/libo$ readelf -d workdir/unxlngx6.pro/LinkTarget/CppunitTest/libtest_smoketest.so Dynamic section at offset 0xe20 contains 22 entries: TagType Name/Value 0x0003 (PLTGOT) 0x1fe8 0x0002 (PLTRELSZ) 24 (bytes) 0x0017 (JMPREL) 0x4a8 0x0014 (PLTREL) RELA 0x0007 (RELA) 0x448 0x0008 (RELASZ) 96 (bytes) 0x0009 (RELAENT)24 (bytes) 0x6ff9 (RELACOUNT) 1 0x0006 (SYMTAB) 0x228 0x000b (SYMENT) 24 (bytes) 0x0005 (STRTAB) 0x300 0x000a (STRSZ) 190 (bytes) 0x6ef5 (GNU_HASH) 0x3c0 0x0001 (NEEDED) Shared library: [libc.so.6] 0x000c (INIT) 0x4c0 0x000d (FINI) 0x608 0x6ff0 (VERSYM) 0x3f8 0x6ffc (VERDEF) 0x40c 0x6ffd (VERDEFNUM) 1 0x6ffe (VERNEED)0x428 0x6fff (VERNEEDNUM) 1 0x (NULL) 0x0 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW] Add Barcode 1.3.5.0
Hi, Can you review and cherry pick Barcode 1.3.5.0 to 3.5 branch? Finally, It is compatible with LibreOffice 3.5. http://extensions.libreoffice.org/extension-center/barcode/releases/1.3.5.0 Thanks, KAMI ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW-3-5] Fix for n#717947, PDF export fixes
Hi, http://cgit.freedesktop.org/libreoffice/core/commit/?id=03a651507e34ee423674d2a537f2bb4b509af6d6 fixes the issue https://bugzilla.novell.com/show_bug.cgi?id=717947 It will be great if someone can review this and cherry-pick it, please? In brief: When Impress slides with image and notes are exported to pdf (along with notes), the images are exported with PreviewSizeHint of 64x64 and scaled to the original size instead of original image. This patch fixes the problem. Thanks to Thorsten for the initial difficult work on this. Thanks Regards, Muthu Subramanian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: make check problem in libtest_smoketest building master
On 12/04/12 12:32, Noel Grandin wrote: On 2012-04-12 11:51, Stephan Bergmann wrote: What is the output of readelf -d workdir/unxlngx6.pro/LinkTarget/CppunitTest/libtest_smoketest.so for you? Output attached. 0x0001 (NEEDED) Shared library: [libc.so.6] yeah, that's rather too little :( this is missing here: 0x0001 (NEEDED) Shared library: [libsmoketest.so] indeed looks like your ld defaults to --as-needed. it should work if you do this: cd smoketest make -r clean make -r LDFLAGS=-Wl,--no-as-needed subsequentcheck wonder what we should do about ld that defaults to --as-needed... ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: make check problem in libtest_smoketest building master
On 2012-04-12 11:56, Stephan Bergmann wrote: Sounds plausible. Just asked Noel for readelf -d output for verification. I would consider an ld that assumes --as-needed per default as broken. For whatever reason, Ubuntu appears to do that now: https://wiki.ubuntu.com/NattyNarwhal/ToolchainTransition Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: make check problem in libtest_smoketest building master
On 2012-04-12 12:40, Michael Stahl wrote: it should work if you do this: cd smoketest make -r clean make -r LDFLAGS=-Wl,--no-as-needed subsequentcheck Indeed that works (not entirely, but at least it gets past the symbol loading issue). Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] Add Barcode 1.3.5.0
On Thu, Apr 12, 2012 at 12:34:00PM +0200, Kálmán „KAMI” Szalai kami...@gmail.com wrote: Can you review and cherry pick Barcode 1.3.5.0 to 3.5 branch? Finally, It is compatible with LibreOffice 3.5. http://extensions.libreoffice.org/extension-center/barcode/releases/1.3.5.0 I assume you were talking about 39d8a541e623fd3ae91e28dc6dfc34411bf23b57, it helps if you mention it next time. ;) Anyway pushed, thanks for this. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: make check problem in libtest_smoketest building master
Zitat von Michael Stahl mst...@redhat.com: On 12/04/12 12:32, Noel Grandin wrote: On 2012-04-12 11:51, Stephan Bergmann wrote: What is the output of readelf -d workdir/unxlngx6.pro/LinkTarget/CppunitTest/libtest_smoketest.so for you? Output attached. 0x0001 (NEEDED) Shared library: [libc.so.6] yeah, that's rather too little :( this is missing here: 0x0001 (NEEDED) Shared library: [libsmoketest.so] indeed looks like your ld defaults to --as-needed. it should work if you do this: cd smoketest make -r clean make -r LDFLAGS=-Wl,--no-as-needed subsequentcheck As it's stated here [1] *Caution:* Reading the documentation, you may be tempted to try the --no-as-needed option as a quick fix workaround, but it's generally the not the right fix. If you aren't able to get a package working with the --as-needed and --no-copy-dt-needed-entries options enabled, it's best to submit a bug report and get expert attention. (It may be a sign of deeper flaws in the code or linking strategy of the package.) [1] https://wiki.ubuntu.com/NattyNarwhal/ToolchainTransition wonder what we should do about ld that defaults to --as-needed... ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice David ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build Failure on Cygwin Windows
On 12/04/12 08:18, Matúš Kukan wrote: Hi Johnny, On 12 April 2012 07:31, Johnny Chen johnny...@gmail.com wrote: LINK : fatal error LNK1104: cannot open file 'c:/cygwinc:/cygwin/home/Johnny/libo/workdir/wntmsci12.pro/CxxObject/xml2cmp/source/xcd/main.o' Does anyone have any idea what may have caused this? It's most probably because you have LibreOffice sources in /home. I would think it works by now but obviously not. Maybe I will investigate why later. rumor has it that putting the source in Cygwin home has never ever worked, but i have no idea why. Sorry for this, preferred way is to have sources in C:/Libo or one directory lower but not too much. yes paths need to be _short_ on Windows... i've just added a warning here so hopefully less people fall into these traps: https://wiki.documentfoundation.org/Development/Windows_Build_Dependencies ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build Failure on Cygwin Windows
On Thu, Apr 12, 2012 at 12:57:40PM +0200, Michael Stahl mst...@redhat.com wrote: yes paths need to be _short_ on Windows... i've just added a warning here so hopefully less people fall into these traps: https://wiki.documentfoundation.org/Development/Windows_Build_Dependencies If we are at it, when you install Cygwin these days, it installs make 3.82.9x, which failed miserably here. Is it just me, or better to suggest using make-3.82-gbuild from dev-tools.git on Windows for now? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Updating the documentation in the IDL files?
On Wed, 2012-04-11 at 20:52 +0300, Tor Lillqvist wrote: But if you have anything more specific about com/sun/star/lang I could probably have a look there. Well, starting with XComponent.idl, I don't see any high-level description what a component *is* ;) I guess there is again the tension between generic interfaces, and a useful taxonomy of the objects (with their interfaces) that LibreOffice actually provides. I imagine there should be a good overview / drawing of the actual objects that the suite provides, with the interfaces they implement as an incidental extra alongside that :-) Trying to infer that structure from the interface documentation is (I suspect) an extremely irritating way to work out how to do what is needed :-) ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: 'make check' with Windows/MSVC build?
On Wed, 2012-04-11 at 18:19 +0200, Stephan Bergmann wrote: So the problem cannot be solved with an #if, but (short of abandoning berkeleydb) needs to be worked around by making sure the LO installation is in a location with a short path (so that the paths of any files within the installation that are handed to berkeleydb are also short). Sigh - if berkeleydb is the only problem here, surely we can get rid of it ? :-) I -thought- that we had done so in 3.5 actually; IIRC we were using it for some component cache, where it would have been faster smaller to use the associated text file ;-) but I forget the details. Hmm, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: 'make check' with Windows/MSVC build?
On Wed, 2012-04-11 at 17:34 +0200, Stephan Bergmann wrote: (And even on Linux, linkoo does not really work, and I'm happy to avoid it via --disable-linkoo. But I do understand that this is not very newbee friendly.) Oh !? we should fix that, is there a bug ? it'd prolly be an easy-hack :-) I believe we killed the black-list for UNO libraries so it should work for them; there is some bug with versioned .so's it seems, so we're missing this little lot: -rwxr-xr-x 1 michael users 231912 Apr 11 17:49 ./program/libcurl.so.4 -rwxr-xr-x 1 michael users 14942632 Apr 11 17:36 ./program/libicudata.so.44.2 -rwxr-xr-x 1 michael users 1785268 Apr 11 17:36 ./program/libicui18n.so.44.2 -rwxr-xr-x 1 michael users 210376 Apr 11 17:36 ./program/libicule.so.44.2 -rwxr-xr-x 1 michael users 1267500 Apr 11 17:36 ./program/libicuuc.so.44.2 -rwxr-xr-x 1 michael users 317620 Apr 11 17:29 ./program/liblcms2.so.2 -rwxr-xr-x 1 michael users 406672 Apr 11 17:57 ./program/libraptor.so.1 -rwxr-xr-x 1 michael users 252788 Apr 11 17:58 ./program/librasqal.so.1 -rwxr-xr-x 1 michael users 240736 Apr 11 17:58 ./program/librdf.so.0 -rwxr-xr-x 1 michael users 248720 Apr 11 17:36 ./program/libxslt.so.1 -rw-r--r-- 1 michael users 752072 Apr 11 18:36 ./share/extensions/pdfimport/pdfimport.uno.so -rwxr-xr-x 1 michael users 108560 Apr 11 17:41 ./ure/lib/libjvmfwk.so.3 -rwxr-xr-x 1 michael users71908 Apr 11 17:41 ./ure/lib/libsunjavaplugin.so -rwxr-xr-x 1 michael users 563620 Apr 11 17:39 ./ure/lib/libuno_cppuhelpergcc3.so.3 -rwxr-xr-x 1 michael users 1311332 Apr 11 17:33 ./ure/lib/libxml2.so.2 But - overall it does a reasonable job - at least for me. ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: what exactly needs localedata_en library ?
On Wednesday 11 of April 2012, Matúš Kukan wrote: Hi, I was investigating which dependency is missing for sometimes failing i18npool_test_breakiterator and it is localedata_en. The dependency was often explicitly written in sc's makefiles (but i18npool is not yet in tail_build, so not needed) and I think: gb_CppunitTest_use_ure,foo = foo requires localedata_en is true, so I created attached patch where the dependency is moved to gb_CppunitTest_use_ure definition. But I don't know if also the other implication is true: gb_CppunitTest_use_ure,foo = foo requires localedata_en I did not push yet but if no one is against I will do so soon because it is safe and maybe also the right thing to do ? As far as I can see, it is the i18npool library that dlopens localedata_en (i18npool/source/localedata/localedata.cxx), so I think the best way to express this dependency is to make i18npool depend on localedata_en (and localedata_es, localedata_euro and localedata_others). While this is not 100% technically correct, as it is only a runtime dependency and not a build dependency, there's no cycle and it should make sure that anything that does or will need localedata_en will have it ready. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build Failure on Cygwin Windows
On Thu, 2012-04-12 at 12:57 +0200, Michael Stahl wrote: rumor has it that putting the source in Cygwin home has never ever worked, but i have no idea why. The conversion from unix-style /cygdrive/c/paths to /c/paths when handing the paths to native tools does a simple search and replace. Any cygwin paths which don't conform to /cygdrive/X are all horribly mangled by the to and from process, so /home and /tmp don't work :-( I burned some time trying to make it work, but higher priority stuff scuppered me. Here's a diff of some hacking I was playing with to try and work through it. C. diff --git a/configure.in b/configure.in index eef6de4..1e0ec69 100644 --- a/configure.in +++ b/configure.in @@ -36,7 +36,7 @@ PathFormat() if test $fp_count_colon = 0 ; then formatted_path=`realpath $formatted_path` fi -formatted_path=`cygpath -m $formatted_path` +formatted_path=`cygpath -m $formatted_path | $AWK -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }'` fi fi } @@ -62,6 +62,12 @@ else fi AC_SUBST(CROSS_COMPILING) +AC_PROG_AWK +AC_PATH_PROG( AWK, $AWK) +if test -z $AWK; then +AC_MSG_ERROR([install awk to run this script]) +fi + if test $build_os = cygwin; then EXEEXT_FOR_BUILD=.exe SRC_ROOT=`pwd` @@ -1995,12 +2001,6 @@ pathmunge () fi } -AC_PROG_AWK -AC_PATH_PROG( AWK, $AWK) -if test -z $AWK; then -AC_MSG_ERROR([install awk to run this script]) -fi - AC_PATH_PROG(BASH, bash) if test -z $BASH; then AC_MSG_ERROR([bash not found in \$PATH]) diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index 10dac0b..0524c75 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -47,7 +47,8 @@ $(subst $(SRCDIR)/,$$S/,$(subst $(OUTDIR)/,$$O/,W=$(WORKDIR) $(subst $(WORKDI endef define gb_Helper_abbreviate_dirs_native -$(call gb_Helper_convert_native,$(call gb_Helper_abbreviate_dirs,$(1))) +$(warning gb_Helper_abbreviate_dirs_native $(1)) \ +$(call gb_Helper_convert_native,$(call gb_Helper_abbreviate_dirs,$(call gb_Helper_convert_nonnative,$(1 endef define gb_Helper_make_clean_target diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 6402b42..02e1d6f 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -247,15 +247,51 @@ gb_Helper_OUTDIR_NATIVE := $(shell cygpath -m $(OUTDIR) | $(gb_AWK) -- '{ print gb_Helper_set_ld_path := PATH=$${PATH}:$(OUTDIR)/bin +define gb_Helper_convert_nonnative +$(warning nonnative input is ::$(1)::) \ +$(strip \ +$(subst $(gb_Helper_SRCDIR_NATIVE),$(SRCDIR), \ +$(subst $(gb_Helper_WORKDIR_NATIVE),$(WORKDIR), \ +$(subst $(gb_Helper_OUTDIR_NATIVE),$(OUTDIR), \ +$(1) \ +$(warning nonnative output is \ +$(strip \ +$(subst $(gb_Helper_SRCDIR_NATIVE),$(SRCDIR), \ +$(subst $(gb_Helper_WORKDIR_NATIVE),$(WORKDIR), \ +$(subst $(gb_Helper_OUTDIR_NATIVE),$(OUTDIR), \ +$(1)) +endef + # convert parameters filesystem root to native notation # does some real work only on windows, make sure not to # break the dummy implementations on unx* define gb_Helper_convert_native +$(warning native input is ::$(1)::) \ $(strip \ $(subst $(SRCDIR),$(gb_Helper_SRCDIR_NATIVE), \ $(subst $(WORKDIR),$(gb_Helper_WORKDIR_NATIVE), \ $(subst $(OUTDIR),$(gb_Helper_OUTDIR_NATIVE), \ -$(1) +$(call gb_Helper_convert_nonnative,$(1)) \ +$(warning replace $(OUTDIR) with $(gb_Helper_OUTDIR_NATIVE)) \ +$(warning replace $(WORKDIR) with $(gb_Helper_WORKDIR_NATIVE)) \ +$(warning replace $(SRCDIR) with $(gb_Helper_SRCDIR_NATIVE)) \ +$(warning native output is \ +$(strip \ +$(subst ::COM2::,$(gb_Helper_SRCDIR_NATIVE), \ +$(subst ::COM1::,$(gb_Helper_WORKDIR_NATIVE), \ +$(subst ::COM0::,$(gb_Helper_OUTDIR_NATIVE), \ +$(subst $(SRCDIR),::COM2::, \ +$(subst $(WORKDIR),::COM1::, \ +$(subst $(OUTDIR),::COM0::, \ +$(call gb_Helper_convert_nonnative,$(1)) +$(strip \ +$(subst ::COM2::,$(gb_Helper_SRCDIR_NATIVE), \ +$(subst ::COM1::,$(gb_Helper_WORKDIR_NATIVE), \ +$(subst ::COM0::,$(gb_Helper_OUTDIR_NATIVE), \ +$(subst $(SRCDIR),::COM2::, \ +$(subst $(WORKDIR),::COM1::, \ +$(subst $(OUTDIR),::COM0::, \ +$(call gb_Helper_convert_nonnative,$(1) endef # YaccTarget class ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Updating the documentation in the IDL files?
On 2012-04-12 11:23, Michael Meeks wrote: Trying to infer that structure from the interface documentation is (I suspect) an extremely irritating way to work out how to do what is needed :-) Perhaps we just need some links to the relevant docs on the libreoffice wiki from places like odk/README offapi/README Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build Failure on Cygwin Windows
On 2012-04-12 13:38, Caolán McNamara wrote: The conversion from unix-style /cygdrive/c/paths to /c/paths when handing the paths to native tools does a simple search and replace. Any cygwin paths which don't conform to /cygdrive/X are all horribly mangled by the to and from process, so /home and /tmp don't work ___ why not use the cygpath utility all the time? Is it an efficiency thing, or a correctness thing? Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: new tinderbox at my company
On Thursday 12 of April 2012, Noel Grandin wrote: Hi So finally (about 3 months later than expected) I've got the tinderbox I promised up and running at my company (Peralex). It's a Windows7-64 machine, 6 CPU cores, 16G of RAM. What do I need to do to get it included into the official tinderbox results? (assuming that would be a useful thing). It happens automatically with -m all . At least it did with my tinderbox. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: 'make check' with Windows/MSVC build?
On 04/12/2012 11:40 AM, Michael Meeks wrote: On Wed, 2012-04-11 at 17:34 +0200, Stephan Bergmann wrote: (And even on Linux, linkoo does not really work, and I'm happy to avoid it via --disable-linkoo. But I do understand that this is not very newbee friendly.) But - overall it does a reasonable job - at least for me. Can't remember any details, but I think I did have a real problem with it before I discovered --disable-linkoo sometime last year, and recently I remote-debugged something with somebody, and we came to the conclusion that the problem (whatever it was) was due to his use of linkoo. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] Resize backing window on window style change to fix what remains of #34392
Gábor Stefanik netrolller...@gmail.com írta (2012. április 9. 20:15): Finally this does it. I think while testing it I've seen one instance of too wide buttons, but never too narrow. However, I'm not sure if this is the proper fix - it feels rather hacky. I've added a comment to this avail. Pushed, thanks. Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] Recompute column widths in BackingWindow::Resize() to partially fix #34392
Gábor Stefanik netrolller...@gmail.com írta (2012. április 9. 18:31): 2012/4/9 Andras Timar tima...@gmail.com: Gábor Stefanik netrolller...@gmail.com írta (2012. április 7. 2:13): With this patch, the start screen displays correctly on startup with scaling set to 130% (tested on OpenSUSE 11.4 x86-64). However, if you start LibreOffice with scaling @ 100%, then change scaling to 130% with the start screen still open, the bug remains. I've looked into it, and this appears to be a separate issue - Resize() is called too early on scaling change, before the new scaling factor is available. As a result, GetTextWidth() uses the old scaling factor to compute widths. If anyone can point me towards where Resize() is called on the scaling change codepath, that would be greatly appreciated. Even without your patch, resizing works in the following scenario: 1. Set scaling to 130% (and observe the clipped text) 2. Press e.g. Text Document button to start Writer. 3. Close Writer with the X control at the top right of the window. 4. Observe that the start center buttons are resized correctly. So basically you are right, the scaling information is missing in the first call, and it is present in subsequent calls. http://opengrok.libreoffice.org/xref/core/framework/source/services/backingwindow.cxx#627 calculates the text width. It is always 100% when called first, regardless of the scaling factor. You need to find out why, e.g. by setting a breakpoint to BackingWindow::initControls() and see the backtrace at each call. Andras Yes, the case that this patch fixes is the following: 1. Set scaling to 130% (and observe the clipped text) 2. Press e.g. Text Document button to start Writer. 3. Close Writer with the X control at the top right of the window. 4. Observe that the start center buttons are resized correctly. 5. Close and re-open LibreOffice. After step 5, without the patch, the buttons are misrendered. With the patch, they are resized correctly. Another interesting effect I noticed: 1. Start up with scaling set to 100%. (Correct rendering.) 2. Set scaling to 130%. (Clipped text - the buttons do not grow.) 3. Set scaling back to 100%. (Now the buttons are too large - they are sized as if the scaling was still 130%.) I've done some debugging (Is there any way to set make debugrun to use something other than plain gdb? I usually use kdbg.), and found that GenericSalLayout::GetTextWidth() is using incorrect glyph width values. Apparently the font size is being set only after BackingWindow::Resize(). (Debugging is further complicated by the fact that as I try to rearrange the code calling Resize() to test various possible fixes, I often get mysterious segfaults which gdb often maps to blank lines in the source code between function definitions. Go figure.) Pushed (combined with your second patch, which gave a full solution to the issue). Thanks, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: new tinderbox at my company
On 2012-04-12 13:55, Lubos Lunak wrote: It happens automatically with -m all . At least it did with my tinderbox. Should I be using the tinbuild or the tinbuild2 script? The -m all option would work with tinbuild2, but it won't work with tinbuild. Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] 2/2 List cleanup in SD
On Wednesday 11 of April 2012, Rafael Dominguez wrote: On Wed, Apr 11, 2012 at 2:53 PM, Caolán McNamara caol...@redhat.com wrote: On Tue, 2012-04-10 at 12:52 +0200, Lubos Lunak wrote: List* GetSelectEntryList( sal_uInt16 nDepth ); +voidGetSelectEntryList (sal_uInt16 nDepth, std::vectorrtl::OUString rEntries) const; Why is that? Changing the return value to a reference argument makes the API worse and it seems like an unnecessary change to me. ... Well the first reason is that you cant overload a function with a return value, Ok, this one didn't occur to me. second reason and the main one, is that copying a vector is costly so to prevent that i passes it by reference avoids that, but i can change it later if needed. Both gcc and msvc can do named return value optimization ([1][2]), so the return object does not actually need to be copied. In a nutshell, if a function as the first thing creates a local variable of the same type as the return type and all return statements return this variable, then the compiler will optimize by placing the variable directly in the place of the return value, thus avoiding the copy. C++11's move semantics (will) make this moot completely. So, in code, a function like this does not create a copy of std::vector: std::vector A foo( bool b ) { std::vector A ret; if( !b ) return ret; // return std::vectorA() would prevent the optimization ... // do things with ret; return ret; } I see no good reason to delay your patches just because of this, but it would be nice if you could do a followup patch to change such functions to return values normally instead of the unneeded manual optimization (presumably with a short suffix on one of the variants as long as both are needed). [1] http://en.wikipedia.org/wiki/Return_value_optimization [2] http://msdn.microsoft.com/en-us/library/ms364057(v=vs.80).aspx -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: make check problem in libtest_smoketest building master
On 04/12/2012 12:40 PM, Michael Stahl wrote: wonder what we should do about ld that defaults to --as-needed... Insist on people compiling with an unbroken toolchain instead? For the smoketest problem at hand, the best thing would probably be to get rid of the broken test_smoketest vs. smoketest library design, anyway. But there are other places where we imply --no-as-needed: Libraries within extensions are guaranteed to be run in an environment where all the public URE libraries are available. The way we ensure that is by explicitly linking the relevant executables against all the relevant URE libraries. (At least that's how we used to do it; might well got broken with some gbuild'ification, and is typically hard to detect, given that most if not all public URE libraries get loaded into a process through one way or another, anyway.) Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW 3-5] fdo#48584 Shift+F3 shortcut in Draw
Hi, http://cgit.freedesktop.org/libreoffice/core/commit/?id=25c194163c531648f7ad8cdb1a64a03407f75efc Shift+F3 shortcut was changed .uno:ChangeCaseRotateCase, but originally in LibreOffice 3.3 it was .uno:CopyObjects. I restored this old behaviour. I think .uno:CopyObjects is more useful in Draw, than .uno:ChangeCaseRotateCase – that functionality was originally requested for Writer. In Impress Shift+F3 is also .uno:CopyObjects. Best regards, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Trying to solve a crasher in editeng unit test
On Thu, 2012-04-12 at 10:50 +0200, Stephan Bergmann wrote: On 04/11/2012 10:44 PM, Kohei Yoshida wrote: On Wed, 2012-04-11 at 21:29 +0100, Caolán McNamara wrote: On Wed, 2012-04-11 at 15:56 -0400, Kohei Yoshida wrote: Hey there, I'm trying to set up a new unit test for the edit engine core, but struggling with one crasher. http://cgit.freedesktop.org/libreoffice/core/commit/?id=6089be1a7a17ae849d8793520e9d8d36296ed5cf should get you closer anyway, and into a more mundane crash with SfxItemPools Thanks a lot. This helps. Hopefully any fix of yours will also fix the following problem: My local --enable-dbgutil make check build keeps failing with a crash in sw_subsequent_rtftok. Valgrind gives Crap. Maybe a unit test in editeng wasn't such a good idea after all. Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
needed: items for blog for promote feature testing
Hi *, Will post a blog tomorrow on TDF blog. The idea (from our QA meetings): is having indeed a list of areas that can be clearly pointed at, and to mention them in a sort of standard post on our official TDF blog. E.g. every two weeks 4 to 8 items and guiding users interested to test in these area's to the daily builds. So simple and clear. I noticed some visible work, e.g. functions that people can clearly look at, - favourites in LibreOffice file dialogue, - rtf import - (possiprolly some more - have to look for them) But now ... more suggestions welcome ! :-) Thanks a lot, -- - Cor - http://nl.libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Automatic using ::rtl::OUString etc.
Hello, would somebody see a problem with this? sal/inc/rtl/ustring.hxx : +#ifdef RTL_AUTOMATIC_USING +using ::rtl::OUString; +using ::rtl::OStringToOUString; +using ::rtl::OUStringToOString; +#endif I seriously doubt there will ever be any O(U)String anywhere in LO build that will not be the rtl one, so the need to explicitly qualify it with the rtl namespace (or go with using, which is what many files do) seem to be just an unnecessary hassle. So I'd like to do this change for those few commonly used rtl types which are in practice namespaced by the name itself (i.e. not the problematic rtl::Reference), and then build all of LO with -DRTL_AUTOMATIC_USING. -- Lubos Lunak l.lu...@suse.cz diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index 0b6e30f..eaacf07 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -54,6 +54,11 @@ $(eval $(call gb_Library_add_defs,sal,\ -DSAL_DLLIMPLEMENTATION \ )) +# ensure that public headers build without this feature +$(eval $(call gb_Library_add_defs,sal,\ + -URTL_AUTOMATIC_USING \ +)) + $(eval $(call gb_Library_use_libraries,sal,\ $(if $(filter $(GUI),UNX), \ $(if $(filter $(OS),ANDROID),, \ diff --git a/sal/inc/rtl/strbuf.hxx b/sal/inc/rtl/strbuf.hxx index 7711308..ec48088 100644 --- a/sal/inc/rtl/strbuf.hxx +++ b/sal/inc/rtl/strbuf.hxx @@ -849,6 +849,10 @@ typedef rtlunittest::OStringBuffer OStringBuffer; #undef RTL_STRING_CONST_FUNCTION #endif +#ifdef RTL_AUTOMATIC_USING +using ::rtl::OStringBuffer; +#endif + #endif /* __cplusplus */ #endif /* _RTL_STRBUF_HXX_ */ diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx index 9791a8c..84d9eba 100644 --- a/sal/inc/rtl/string.hxx +++ b/sal/inc/rtl/string.hxx @@ -1467,6 +1467,11 @@ struct OStringHash } /* Namespace */ +#ifdef RTL_AUTOMATIC_USING +using ::rtl::OString; +using ::rtl::OStringHash; +#endif + #endif /* _RTL_STRING_HXX_ */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx index a887107..cbfcb5c 100644 --- a/sal/inc/rtl/ustrbuf.hxx +++ b/sal/inc/rtl/ustrbuf.hxx @@ -962,6 +962,10 @@ typedef rtlunittest::OUStringBuffer OUStringBuffer; } #endif +#ifdef RTL_AUTOMATIC_USING +using ::rtl::OUStringBuffer; +#endif + #endif /* _RTL_USTRBUF_HXX_ */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx index 883fb93..1c9d34a 100644 --- a/sal/inc/rtl/ustring.hxx +++ b/sal/inc/rtl/ustring.hxx @@ -2083,6 +2083,13 @@ inline OString OUStringToOString( const OUString rUnicode, } /* Namespace */ +#ifdef RTL_AUTOMATIC_USING +using ::rtl::OUString; +using ::rtl::OUStringHash; +using ::rtl::OStringToOUString; +using ::rtl::OUStringToOString; +#endif + #endif /* _RTL_USTRING_HXX */ // Include the ostream operator directly here, so that it's always available diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 0df48c4..1f492fb 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -59,6 +59,7 @@ gb_COMPILERDEFS := \ -DBOOST_MEM_FN_ENABLE_CDECL \ -DCPPU_ENV=msci \ -DM1500 \ + -DRTL_AUTOMATIC_USING \ gb_CPUDEFS := -D_X86_=1 diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 36b2cc7..435030a 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -85,6 +85,7 @@ gb_COMPILERDEFS := \ -D$(COM) \ -DCPPU_ENV=gcc3 \ -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \ + -DRTL_AUTOMATIC_USING \ gb_CFLAGS_COMMON := \ -Wall \ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Trying to solve a crasher in editeng unit test
On Thu, 2012-04-12 at 09:46 -0400, Kohei Yoshida wrote: Crap. Maybe a unit test in editeng wasn't such a good idea after all. I disabled it and backed out a few bit for the moment. I have a fairly good idea what the various problems are so I might have a go at fixing it up again in a bit. *mumable* unotest::testDown has its dispose commented out ages ago, putting that back in shows some other problems with various mixes of global singletons that exist for the duration of a test-suite and the per-test globals which get setup and reset for each test. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: new tinderbox at my company
On Thu, Apr 12, 2012 at 7:14 AM, Noel Grandin n...@peralex.com wrote: So finally (about 3 months later than expected) I've got the tinderbox I promised up and running at my company (Peralex). Great :-) On 2012-04-12 13:55, Lubos Lunak wrote: It happens automatically with -m all . At least it did with my tinderbox. Should I be using the tinbuild or the tinbuild2 script? tinbuild2 as for notification... ./tinbuild2 --help says... -m [all,tb,owner,author,none] tb=mail progress to the tinderbox, all=tb + mail errors to the committer, general errors to the owner. owner= tb + any other mail to the owner only debug=any mail (progress or error) is sent to the owner author=send failure email to the authors + owner tb is not in the loop none=no mail If in doubt, use all. make sure to run a 'sanity check' ( tinbuild2 -p profile -c ) to make sure, among other things, that the emails mechanics works Please see : http://wiki.documentfoundation.org/Development/Tinderbox and update it as needed. and don't forget README.tinbuild2 in the buildbot repo :-) Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: what exactly needs localedata_en library ?
Hi, On Thursday, 2012-04-12 13:33:38 +0200, Lubos Lunak wrote: As far as I can see, it is the i18npool library that dlopens localedata_en (i18npool/source/localedata/localedata.cxx), so I think the best way to express this dependency is to make i18npool depend on localedata_en (and localedata_es, localedata_euro and localedata_others). Might be an approach. While at it, dependencies on the various libdict_* and lib*_data* that are dlopen'ed by i18npool could be added as well. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgplfG7IEcaDa.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Trying to solve a crasher in editeng unit test
On Thu, Apr 12, 2012 at 10:06 AM, Caolán McNamara caol...@redhat.com wrote: On Thu, 2012-04-12 at 09:46 -0400, Kohei Yoshida wrote: Crap. Maybe a unit test in editeng wasn't such a good idea after all. I disabled it and backed out a few bit for the moment. I have a fairly good idea what the various problems are so I might have a go at fixing it up again in a bit. *mumable* unotest::testDown has its dispose commented out ages ago, putting that back in shows some other problems with various mixes of global singletons that exist for the duration of a test-suite and the per-test globals which get setup and reset for each test. Yes. Some of my changes were an attempt to address that. But apparently my skill is not up for it. I give up now. You did the right thing by backing out my changes. Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: new tinderbox at my company
On Thursday 12 of April 2012, Norbert Thiebaud wrote: On Thu, Apr 12, 2012 at 7:14 AM, Noel Grandin n...@peralex.com wrote: So finally (about 3 months later than expected) I've got the tinderbox I promised up and running at my company (Peralex). Great :-) On 2012-04-12 13:55, Lubos Lunak wrote: It happens automatically with -m all . At least it did with my tinderbox. Should I be using the tinbuild or the tinbuild2 script? tinbuild2 Shouldn't the (obsolete I assume) tinbuild be simply removed in the repository? Please see : http://wiki.documentfoundation.org/Development/Tinderbox and update it as needed. and don't forget README.tinbuild2 in the buildbot repo :-) I did not forget README.tinbuild2 in the case of my tinderbox, but I've never heard about that wiki page until now. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: new tinderbox at my company
On 2012-04-12 16:09, Norbert Thiebaud wrote: Please see : http://wiki.documentfoundation.org/Development/Tinderbox and update it as needed. and don't forget README.tinbuild2 in the buildbot repo Awesome, followed instructions, just waiting for primer to complete. Note that how to setup the flock binary is not documented in the README.tinbuild2 anywhere, but I worked it out :-) Ah, I see now that it is documented in README. Perhaps that section should be copied to README.tinbuild2 for the day when tinbuild2 replaces tinbuild completely? Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [patch] comment translations
On Thursday 05 of April 2012, Mark Wolf wrote: Hi, all. Here are some more comments translated from German to English. This time for the 'core/odk' folder. Could somebody German-speaking please review the patch? It hasn't been pushed yet as far as I can tell. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: new tinderbox at my company
On Thu, Apr 12, 2012 at 9:25 AM, Lubos Lunak l.lu...@suse.cz wrote: On Thursday 12 of April 2012, Norbert Thiebaud wrote: On Thu, Apr 12, 2012 at 7:14 AM, Noel Grandin n...@peralex.com wrote: So finally (about 3 months later than expected) I've got the tinderbox I promised up and running at my company (Peralex). Great :-) On 2012-04-12 13:55, Lubos Lunak wrote: It happens automatically with -m all . At least it did with my tinderbox. Should I be using the tinbuild or the tinbuild2 script? tinbuild2 Shouldn't the (obsolete I assume) tinbuild be simply removed in the repository? Well, that is the usual soft-transition problem... I don't know if someone is still using the original tinbuild script... maybe renaming it tinbuild-old or something and see if someone is screaming ? Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: new tinderbox at my company
On Thu, Apr 12, 2012 at 9:36 AM, Noel Grandin n...@peralex.com wrote: On 2012-04-12 16:09, Norbert Thiebaud wrote: Please see : http://wiki.documentfoundation.org/Development/Tinderbox and update it as needed. and don't forget README.tinbuild2 in the buildbot repo Awesome, followed instructions, just waiting for primer to complete. Note that how to setup the flock binary is not documented in the README.tinbuild2 anywhere, but I worked it out :-) really? you made it work on Windows ? so far I always used -e to disable flock... but sure, documentation improvements (and any other improvement for that matter) are welcomed :-) Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: new tinderbox at my company
On Thu, Apr 12, 2012 at 9:36 AM, Noel Grandin n...@peralex.com wrote: On 2012-04-12 16:09, Norbert Thiebaud wrote: Please see : http://wiki.documentfoundation.org/Development/Tinderbox and update it as needed. and don't forget README.tinbuild2 in the buildbot repo Awesome, followed instructions, just waiting for primer to complete. BTW: I recently did some work to setup a Windows bot.. (see id=16) and found out that: 1/ --disable-dependency-tracking is a big gain. (tinbuild2 always do make clean + make anyway so no need for dep-tracking) 2/ using ccache bring marginal gain on my box.. but that is not as clear cut as it is for other platform. (see ccache-msvc in thedev-tools repo) 3/ I run on a 6-core i7-3960X overclocked 4GHz + 16GB of RAM, and 'over-committing' seems to get me the best elapsed time: iow: I use --with-max-jobs=12 --with-num-cpus=8 Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: new tinderbox at my company
On Thursday 12 of April 2012, Norbert Thiebaud wrote: On Thu, Apr 12, 2012 at 9:25 AM, Lubos Lunak l.lu...@suse.cz wrote: On Thursday 12 of April 2012, Norbert Thiebaud wrote: On Thu, Apr 12, 2012 at 7:14 AM, Noel Grandin n...@peralex.com wrote: So finally (about 3 months later than expected) I've got the tinderbox I promised up and running at my company (Peralex). Great :-) On 2012-04-12 13:55, Lubos Lunak wrote: It happens automatically with -m all . At least it did with my tinderbox. Should I be using the tinbuild or the tinbuild2 script? tinbuild2 Shouldn't the (obsolete I assume) tinbuild be simply removed in the repository? Well, that is the usual soft-transition problem... I don't know if someone is still using the original tinbuild script... maybe renaming it tinbuild-old or something and see if someone is screaming ? Does the old script provide something the new one doesn't? It's not developed anymore anyway, so if somebody insists so much on using it, they just can stick with an old commit, for the same result. But the transition appears to be rather simple, so I see little point in staying with it. And it was rather confusing to see two different things in the same repo when I was setting up my tinderbox. On Thursday 12 of April 2012, Norbert Thiebaud wrote: On Thu, Apr 12, 2012 at 9:36 AM, Noel Grandin n...@peralex.com wrote: Note that how to setup the flock binary is not documented in the README.tinbuild2 anywhere, but I worked it out :-) really? you made it work on Windows ? so far I always used -e to disable flock... I've read somewhere that the most recent Cygwin version has some locking fixes. The Win-x86@6-fast tinderbox uses it too (although it's the only build running there, so I can't say how much it actually works in practice). -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice