[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