[Libreoffice-commits] .: 5 commits - set_soenv.in
set_soenv.in | 142 ++- 1 file changed, 36 insertions(+), 106 deletions(-) New commits: commit 02c29d0bb25044b73dd073555ae2d908eb12e7c6 Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Sep 19 10:54:04 2011 +0300 Drop unused WinFormat function diff --git a/set_soenv.in b/set_soenv.in index 64f25d3..5ffd45f 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -2329,69 +2329,6 @@ sub CygFormat return $variable; } #-- -# Function name: WinFormat -# Description: Format variables to Windows Format. -# Arguments: 1. Variable (string) -# Return value: Reformatted String -#-- -sub WinFormat -{ my ( $variable, $d1 ); - $variable = $_[ 0 ]; - $variable =~ s/^\s+//g ; #remove leading spaces - $variable =~ s/\s+$//g ; #remove trailing spaces - $variable =~ s/(\$\{?\w+\}?)/$1/eeg ; # expand the variables - $variable =~ s/(\$\{?\w+\}?)/$1/eeg ; # expand the variables twice! - $variable =~ s/:+/:/g ; # remove multiple ; - - # Some variables are already in DOS path format, return early. - if ( $variable =~ /\\/ ) { - return $variable; - } - if ( $variable eq ; ) { - # Ignore single ';' - return $variable; - } - if ( $variable =~ /;/ and $variable =~ /\// ) { - # Mixed mode path-style entry, separated with ;, like CLASSPATH - return $variable; - } - - # Search for posix path entry and replace with cygpath -w entry - # ( -d if filename contains space ) - - # Normal paths - - # One special case is if perl is prepended. - $variable =~ /^(perl\s+)?(.*)$/; - my $perlpre = $1; - if ( !defined($perlpre) ) { - $perlpre = ; - } - $variable = $2; - - if ( $variable =~ /^\/[\w\.~ ]+/ ) { - if ( $variable =~ / / ) { - # Use DOS 8.3 style to avoid quoting - chomp( $variable = qx{cygpath -d $variable} ); - } else { - # Use normal filenames - chomp( $variable = qx{cygpath -w $variable} ); - } - } else { - # relative or absolute DOS paths here - $variable =~ s#/#\\#g; - } - - $variable = $perlpre.$variable; - if ( ($perlpre ne ) ($^O eq cygwin)) { - # Cygwin's perl needs quoted backslashes - $variable =~ s#\\##g; - } - - return $variable; -} - -#-- # Function name: WinPath # Description: Reformat a $sep seperated path using DOS paths. # Arguments: 1. Variable (string) commit d6c245d87c14e8b08208e6afa12b27e8c74d381d Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Sep 19 10:48:29 2011 +0300 Drop ActiveState Perl support Why make life harder on purpose? On Cygwin, we support the Cygwin Perl, period. diff --git a/set_soenv.in b/set_soenv.in index 375940e..64f25d3 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -1143,33 +1143,29 @@ elsif ($platform =~ m/cygwin/) } # Add the rest of the original path if it is still missing. - if (($^O eq cygwin)) { # Not for ActiveState perl - my $expandedPATH = $PATH; - $expandedPATH =~ s/(\$\w+)/$1/eeg; - - # fix situations where PATH may look like /bin:C:\blah\bleh:/ugh - my $fixedPATH = $oldPATH; - if ( $oldPATH =~ // ) { - $fixedPATH = ; - foreach my $pathentry ( split( '',$oldPATH ) ) { - if ( ( $pathentry =~ /^$ps/ ) || ( $pathentry =~ /$ps$/ ) ) { - $fixedPATH .= $pathentry; - } else { - chomp( $pathentry = qx{cygpath -d $pathentry} ) ; - chomp( $pathentry = qx{cygpath -u $pathentry} ) ; - $fixedPATH .= $pathentry; - } - } + my $expandedPATH = $PATH; + $expandedPATH =~ s/(\$\w+)/$1/eeg; + + # fix situations where PATH may look like /bin:C:\blah\bleh:/ugh + my $fixedPATH = $oldPATH; + if ( $oldPATH =~ // ) { + $fixedPATH = ; + foreach my $pathentry ( split( '',$oldPATH ) ) { + if ( ( $pathentry =~ /^$ps/ ) || ( $pathentry =~ /$ps$/ ) ) { + $fixedPATH .= $pathentry; + } else { + chomp( $pathentry = qx{cygpath -d $pathentry} ) ; + chomp( $pathentry = qx{cygpath -u $pathentry} ) ; + $fixedPATH .= $pathentry; } + } + } - foreach my $pathentry (split($ps,$fixedPATH)) { - if ( ! ( $expandedPATH =~ /(?:$ps|\A)(?:$pathentry)(?:$ps|\Z)/ ) ) { - $PATH .= $ps.$pathentry; - $expandedPATH .= $ps.$pathentry; - } + foreach my $pathentry (split($ps,$fixedPATH)) { + if ( ! ( $expandedPATH =~ /(?:$ps|\A)(?:$pathentry)(?:$ps|\Z)/ ) ) { + $PATH .= $ps.$pathentry; + $expandedPATH .= $ps.$pathentry; } - } else { - $PATH .= $ps.$oldPATH; } # The path now is in cygwin posix format @@ -2180,6 +2176,9 @@
[Libreoffice-commits] .: configure.in
configure.in |1 + 1 file changed, 1 insertion(+) New commits: commit 0a9486e8f381112cb4f74eb4c55aad11fdf8cfaf Author: Peter Foley pefol...@verizon.net Date: Sat Sep 17 21:43:53 2011 -0400 fix cross-compilation failure after gbuildization of desktop diff --git a/configure.in b/configure.in index 43c34a5..edc956a 100755 --- a/configure.in +++ b/configure.in @@ -2101,6 +2101,7 @@ if test $cross_compiling = yes; then solenv/inc/minor.mk \ solenv/inc/postset.mk \ solenv/inc/productversion.mk \ + desktop/scripts/soffice.sh.in \ | (cd CONF-FOR-BUILD tar xf -) ( unset COM GUI GUIBASE OS CPU CPUNAME ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: desktop/Executable_oosplash.mk
desktop/Executable_oosplash.mk |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit 38fd95ced1c68a4f4d8dbcee86bb808f8e918171 Author: Peter Foley pefol...@verizon.net Date: Sun Sep 18 11:27:45 2011 -0400 fix link failure on linux if not using libXinerama diff --git a/desktop/Executable_oosplash.mk b/desktop/Executable_oosplash.mk index 3cf7bae..63623cf 100644 --- a/desktop/Executable_oosplash.mk +++ b/desktop/Executable_oosplash.mk @@ -53,12 +53,17 @@ $(eval $(call gb_Executable_add_defs,oosplash,\ )) $(eval $(call gb_Executable_add_libs,oosplash,\ --lX11 \ -lXinerama \ )) endif +ifeq ($(GUI),UNX) +$(eval $(call gb_Executable_add_libs,oosplash,\ +-lX11 \ +)) +endif + ifeq ($(ENABLE_QUICKSTART_LIBPNG),TRUE) $(eval $(call gb_Executable_add_defs,oosplash,\ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - bean/com bean/Jar_officebean.mk bean/JunitTest_bean_complex.mk bean/Library_officebean.mk bean/Makefile bean/Module_bean.mk bean/native bean/prj bean/qa bean/util
Module_tail_build.mk |2 Repository.mk|2 RepositoryModule_ooo.mk |2 bean/Jar_officebean.mk | 69 +++ bean/JunitTest_bean_complex.mk | 48 +++ bean/Library_officebean.mk | 52 bean/Makefile| 38 bean/Module_bean.mk | 46 ++ bean/com/sun/star/beans/makefile.mk | 64 -- bean/com/sun/star/comp/beans/makefile.mk | 75 - bean/native/unix/makefile.mk | 40 - bean/native/win32/makefile.mk| 38 bean/prj/build.lst | 10 -- bean/prj/d.lst |5 - bean/prj/makefile.mk | 40 + bean/qa/complex/bean/makefile.mk | 134 --- bean/util/makefile.mk| 56 eventattacher/Library_evtatt.mk | 46 ++ eventattacher/Makefile | 38 eventattacher/Module_eventattacher.mk| 34 +++ eventattacher/prj/build.lst |6 - eventattacher/prj/d.lst |4 eventattacher/prj/makefile.mk| 40 + eventattacher/source/makefile.mk | 71 postprocess/packcomponents/makefile.mk |2 postprocess/prj/build.lst|2 scp2/source/ooo/file_library_ooo.scp | 22 - tail_build/prj/build.lst |2 28 files changed, 465 insertions(+), 523 deletions(-) New commits: commit 4aba8d5cec9544080c79802bb6c120a2a1dd1fe8 Author: Peter Foley pefol...@verizon.net Date: Sun Sep 18 16:36:58 2011 -0400 convert eventattacher to gbuild and add to tail_build diff --git a/Module_tail_build.mk b/Module_tail_build.mk index 9e35fc8..c08919b 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ cui \ dbaccess \ desktop \ +eventattacher \ fileaccess \ forms \ formula \ diff --git a/Repository.mk b/Repository.mk index afdd5ca..950a239 100644 --- a/Repository.mk +++ b/Repository.mk @@ -100,6 +100,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ canvastools \ communi \ date \ + evtatt \ forui \ odbc \ odbcbase \ diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index 8e1b817..58e31c5 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -45,6 +45,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ drawinglayer \ dtrans \ editeng \ +eventattacher \ fileaccess \ forms \ formula \ diff --git a/eventattacher/Library_evtatt.mk b/eventattacher/Library_evtatt.mk new file mode 100644 index 000..7c3f9ef --- /dev/null +++ b/eventattacher/Library_evtatt.mk @@ -0,0 +1,46 @@ +# +# 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 or as specified alternatively below. 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 +# Peter Foley pefol...@verizon.net +# Portions created by the Initial Developer are Copyright (C) 2011 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# 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. +# + +$(eval $(call gb_Library_Library,evtatt)) + +$(eval $(call gb_Library_set_componentfile,evtatt,eventattacher/source/evtatt)) + +$(eval $(call gb_Library_add_linked_libs,evtatt,\ + cppuhelper \ + cppu \ + sal \ +)) + +$(eval $(call gb_Library_add_exception_objects,evtatt,\ + eventattacher/source/eventattacher \ +)) + +$(eval $(call gb_Library_add_api,evtatt,\ + udkapi \ +)) diff --git a/eventattacher/Makefile b/eventattacher/Makefile new file mode 100644 index 000..5bedaf0 --- /dev/null +++ b/eventattacher/Makefile @@ -0,0 +1,38 @@ +#* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +#
[Libreoffice-commits] .: desktop/Executable_guiloader.mk desktop/Executable_guistdio.mk desktop/Executable_officeloader.mk desktop/Library_deploymentgui.mk desktop/Library_deployment.mk
desktop/Executable_guiloader.mk|9 + desktop/Executable_guistdio.mk |9 + desktop/Executable_officeloader.mk |1 + desktop/Library_deployment.mk |1 + desktop/Library_deploymentgui.mk |9 + 5 files changed, 29 insertions(+) New commits: commit 04adca77b45cb8d8a3cafaa704d2296c29cfdb60 Author: Caolán McNamara caol...@redhat.com Date: Mon Sep 19 10:42:01 2011 +0100 inch closer to building under windows diff --git a/desktop/Executable_guiloader.mk b/desktop/Executable_guiloader.mk index a645b68..d04ee32 100644 --- a/desktop/Executable_guiloader.mk +++ b/desktop/Executable_guiloader.mk @@ -38,6 +38,15 @@ $(eval $(call gb_Executable_add_linked_static_libs,guiloader,\ ooopathutils \ )) +ifeq ($(OS),WNT) + +$(eval $(call gb_Executable_add_linked_libs,guiloader,\ +user32 \ +)) + +endif + + $(eval $(call gb_Executable_add_noexception_objects,guiloader,\ desktop/win32/source/extendloaderenvironment \ desktop/win32/source/guiloader/genericloader \ diff --git a/desktop/Executable_guistdio.mk b/desktop/Executable_guistdio.mk index e38efa2..796de55 100644 --- a/desktop/Executable_guistdio.mk +++ b/desktop/Executable_guistdio.mk @@ -38,6 +38,15 @@ $(eval $(call gb_Executable_add_defs,guistdio,\ $(LFS_CFLAGS) \ )) +ifeq ($(OS),WNT) + +$(eval $(call gb_Executable_add_linked_libs,guistdio,\ +user32 \ +)) + +endif + + $(eval $(call gb_Executable_add_exception_objects,guistdio,\ desktop/win32/source/guistdio/guistdio \ )) diff --git a/desktop/Executable_officeloader.mk b/desktop/Executable_officeloader.mk index d10d44f..fa2a7bb 100644 --- a/desktop/Executable_officeloader.mk +++ b/desktop/Executable_officeloader.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Executable_add_linked_libs,officeloader,\ advapi32 \ shell32 \ shlwapi \ +user32 \ )) endif diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk index dd1c3f3..60cc182 100644 --- a/desktop/Library_deployment.mk +++ b/desktop/Library_deployment.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Library_add_linked_libs,deployment,\ ucbhelper \ utl \ xcr \ +$(gb_STDLIBS) \ )) $(eval $(call gb_Library_use_externals,deployment,\ diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk index 15de597..0b3c541 100644 --- a/desktop/Library_deploymentgui.mk +++ b/desktop/Library_deploymentgui.mk @@ -59,6 +59,15 @@ $(eval $(call gb_Library_add_linked_libs,deploymentgui,\ vcl \ )) +ifeq ($(OS),WNT) + +$(eval $(call gb_Library_add_linked_libs,deploymentgui,\ +ole32 \ +)) + +endif + + $(eval $(call gb_Library_set_componentfile,deploymentgui,desktop/source/deployment/gui/deploymentgui)) $(eval $(call gb_Library_add_exception_objects,deploymentgui,\ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - ucb/source
ucb/source/ucp/odma/odma_lib.cxx | 15 --- 1 file changed, 12 insertions(+), 3 deletions(-) New commits: commit 299ada910665c38cc9ccd7a20fb54f8b15229f8c Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Sep 19 12:29:40 2011 +0100 Improve windows odma library location Signed-off-by: Michael Meeks michael.me...@novell.com diff --git a/ucb/source/ucp/odma/odma_lib.cxx b/ucb/source/ucp/odma/odma_lib.cxx index 074c585..f998358 100644 --- a/ucb/source/ucp/odma/odma_lib.cxx +++ b/ucb/source/ucp/odma/odma_lib.cxx @@ -80,16 +80,25 @@ namespace odma if (bBeenHere) return bLoaded; +bBeenHere = sal_True; + ::rtl::OUString sPath; #ifdef WNT -sPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODMA32.DLL)); +OSL_ASSERT( sizeof( wchar_t ) == sizeof( sal_Unicode ) ); + +wchar_t system32[MAX_PATH]; +UINT n = GetSystemDirectoryW( system32, MAX_PATH ); + +if (n == 0) +return sal_False; + +sPath = ::rtl::OUString( reinterpret_cast const sal_Unicode* ( system32 ), n ) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(\\ODMA32.DLL)); + #endif #ifdef UNX sPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(libodma.so)); #endif -bBeenHere = sal_True; - pODMA = osl_loadModule( sPath.pData,SAL_LOADMODULE_NOW ); if( !pODMA) return sal_False; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_sw binfilter/inc
binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx|7 --- binfilter/bf_sw/source/core/inc/notxtfrm.hxx |1 binfilter/bf_sw/source/core/layout/sw_calcmove.cxx | 31 binfilter/bf_sw/source/core/view/sw_viewsh.cxx | 39 - binfilter/bf_sw/source/core/view/sw_vnew.cxx |5 -- binfilter/inc/bf_sw/viewsh.hxx |8 6 files changed, 91 deletions(-) New commits: commit 08e4dea45941c961e5f1625c1d6f07bc2d9662f4 Author: Caolán McNamara caol...@redhat.com Date: Mon Sep 19 15:35:04 2011 +0100 callcatcher: remove freshly unused code diff --git a/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx b/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx index 1f84bf8..d90978b 100644 --- a/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx +++ b/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx @@ -302,13 +302,6 @@ extern void ClrContourCache( const SdrObject *pObj ); // TxtFly.Cxx /*N*/ pGrfNd-GetGrfObj().StopAnimation( pOut, long(this) ); /*N*/ } - -/*N*/ BOOL SwNoTxtFrm::HasAnimation() const -/*N*/ { -/*N*/ const SwGrfNode* pGrfNd = GetNode()-GetGrfNode(); -/*N*/ return pGrfNd pGrfNd-IsAnimated(); -/*N*/ } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/binfilter/bf_sw/source/core/inc/notxtfrm.hxx b/binfilter/bf_sw/source/core/inc/notxtfrm.hxx index d749d67..044f075 100644 --- a/binfilter/bf_sw/source/core/inc/notxtfrm.hxx +++ b/binfilter/bf_sw/source/core/inc/notxtfrm.hxx @@ -73,7 +73,6 @@ public: void GetGrfArea( SwRect rRect, SwRect * = 0, BOOL bMirror = TRUE ) const; void StopAnimation( OutputDevice* = 0 ) const; -BOOL HasAnimation() const; // Routinen fuer den Grafik-Cache USHORT GetWeight() { return nWeight; } diff --git a/binfilter/bf_sw/source/core/layout/sw_calcmove.cxx b/binfilter/bf_sw/source/core/layout/sw_calcmove.cxx index 644d285..e252511 100644 --- a/binfilter/bf_sw/source/core/layout/sw_calcmove.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_calcmove.cxx @@ -485,37 +485,6 @@ namespace binfilter { |* SwPageFrm::MakeAll() |* |*/ - -/*N*/ void lcl_CheckObjects( SwSortDrawObjs* pSortedObjs, SwFrm* pFrm, long rBot ) -/*N*/ { -/*N*/ //Und dann kann es natuerlich noch Absatzgebundene -/*N*/ //Rahmen geben, die unterhalb ihres Absatzes stehen. -/*N*/ long nMax = 0; -/*N*/ for ( USHORT i = 0; i pSortedObjs-Count(); ++i ) -/*N*/ { -/*N*/ SdrObject *pObj = (*pSortedObjs)[i]; -/*N*/ long nTmp = 0; -/*N*/ if ( pObj-IsWriterFlyFrame() ) -/*N*/ { -/*N*/ SwFlyFrm *pFly = ((SwVirtFlyDrawObj*)pObj)-GetFlyFrm(); -/*N*/ if( pFly-Frm().Top() != WEIT_WECH -/*N*/ ( pFrm-IsPageFrm() ? pFly-IsFlyLayFrm() : -/*N*/ ( pFly-IsFlyAtCntFrm() -/*N*/ ( pFrm-IsBodyFrm() ? pFly-GetAnchor()-IsInDocBody() : -/*N*/ pFly-GetAnchor()-IsInFtn() ) ) ) ) -/*N*/ { -/*N*/ nTmp = pFly-Frm().Bottom(); -/*N*/ } -/*N*/ } -/*N*/ else -/*N*/ nTmp = pObj-GetBoundRect().Bottom(); -/*N*/ nMax = Max( nTmp, nMax ); -/*N*/ } -/*N*/ ++nMax; //Unterkante vs. Hoehe! -/*N*/ rBot = Max( rBot, nMax ); -/*N*/ } - - /*N*/ void SwPageFrm::MakeAll() /*N*/ { /*N*/ PROTOCOL_ENTER( this, PROT_MAKEALL, 0, 0 ) diff --git a/binfilter/bf_sw/source/core/view/sw_viewsh.cxx b/binfilter/bf_sw/source/core/view/sw_viewsh.cxx index cc539de..9e72015 100644 --- a/binfilter/bf_sw/source/core/view/sw_viewsh.cxx +++ b/binfilter/bf_sw/source/core/view/sw_viewsh.cxx @@ -66,45 +66,6 @@ bool bInSizeNotify = FALSE; /*N*/ TYPEINIT0(ViewShell); -/** -|* -|* ViewShell::InvalidateWindows() -|* -**/ - -/*N*/ void ViewShell::InvalidateWindows( const SwRect rRect ) -/*N*/ { -/*N*/ ViewShell *pSh = this; -/*N*/ do -/*N*/ { -/*N*/ if ( pSh-GetWin() ) -/*N*/ { -/*N*/ if ( pSh-IsPreView() ) -/*?*/ DBG_BF_ASSERT(0, STRIP); -/*N*/ else if ( pSh-VisArea().IsOver( rRect ) ) -/*N*/ pSh-GetWin()-Invalidate( rRect.SVRect() ); -/*N*/ } -/*N*/ pSh = (ViewShell*)pSh-GetNext(); -/*N*/ -/*N*/ } while ( pSh != this ); -/*N*/ } - -/** -|* -|* ViewShell::SetFirstVisPageInvalid() -|* -**/ - -/*N*/ void ViewShell::SetFirstVisPageInvalid() -/*N*/ { -/*N*/ ViewShell *pSh = this; -/*N*/ do -/*N*/ { pSh-Imp()-SetFirstVisPageInvalid(); -/*N*/ pSh = (ViewShell*)pSh-GetNext(); -/*N*/ -/*N*/ } while ( pSh != this ); -/*N*/ } - /*N*/ OutputDevice
[Libreoffice-commits] .: 3 commits - dbaccess/source solenv/gbuild solenv/inc
dbaccess/source/core/dataaccess/databasecontext.cxx |5 - solenv/gbuild/CppunitTest.mk|1 - solenv/gbuild/platform/macosx.mk|3 +++ solenv/inc/settings.mk |1 - 4 files changed, 7 insertions(+), 3 deletions(-) New commits: commit 79fdb70baf70aeb492437ef85de7f02ad4234f21 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Sep 19 21:39:46 2011 +0200 Call macosx-change-install-names on executables in gbuild, too. diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index f71c5af..e30201b 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -337,6 +337,9 @@ $(call gb_Helper_abbreviate_dirs,\ $(LIBS) \ -o $(1) \ `cat $${DYLIB_FILE}` \ +$(if $(filter Executable,$(TARGETTYPE)), \ +$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Executable \ +$(LAYER) $(1) ) \ $(if $(filter Library CppunitTest,$(TARGETTYPE)),\ $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Library $(LAYER) $(1) \ ln -sf $(1) $(patsubst %.dylib,%.jnilib,$(1)) ) \ commit 966f3c0f6df43185c572c451269604095428e917 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Sep 19 15:53:25 2011 +0200 Removed --leak-check=yes from CppUnit valgrind/memcheck calls. Can be enabled via VALGRIND_OPTS=--leak-check=yes. diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index cdfe4f0..e2010d5 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -43,7 +43,6 @@ endif ifneq ($(strip $(VALGRIND)),) gb_CppunitTest_VALGRINDTOOL := valgrind --tool=$(VALGRIND) --num-callers=50 ifeq ($(strip $(VALGRIND)),memcheck) -gb_CppunitTest_VALGRINDTOOL += --leak-check=yes G_SLICE := always-malloc export G_SLICE GLIBCXX_FORCE_NEW := 1 diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index f395fa1..b5b7e60 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -1049,7 +1049,6 @@ GDBTRACE=gdb -nx --command=$(SOLARENV)/bin/gdbtrycatchtrace --args .IF $(VALGRIND) != VALGRINDTOOL=valgrind --tool=$(VALGRIND) --num-callers=50 .IF $(VALGRIND) == memcheck -VALGRINDTOOL+=--leak-check=yes G_SLICE*:=always-malloc .EXPORT : G_SLICE GLIBCXX_FORCE_NEW*:=1 commit c9b1cb5ae36b1057fb185945b52d3e45c5436bb6 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Sep 19 15:49:25 2011 +0200 Avoid premature deletion of objects in ODatabaseContext::m_aDatabaseObjects. Access of deleted objects found with valgrind/memcheck of dbaccess/qa/unoapi. diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx index 22f77a7..f542d2b 100644 --- a/dbaccess/source/core/dataaccess/databasecontext.cxx +++ b/dbaccess/source/core/dataaccess/databasecontext.cxx @@ -291,7 +291,10 @@ void ODatabaseContext::disposing() ++aIter ) { -aIter-second-dispose(); +rtl::Reference ODatabaseModelImpl obj(aIter-second); +// make sure obj is acquired and does not delete itself from within +// dispose() +obj-dispose(); } m_aDatabaseObjects.clear(); } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - solenv/gbuild
solenv/gbuild/platform/macosx.mk |2 ++ 1 file changed, 2 insertions(+) New commits: commit a87a8ee5a1919f6f6b4b35668456c03bdd499c85 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Sep 19 21:39:46 2011 +0200 Call macosx-change-install-names on executables in gbuild, too. Signed-off-by: Bjoern Michaelsen bjoern.michael...@canonical.com diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 2def0c9..ff7 100755 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -274,6 +274,8 @@ $(call gb_Helper_abbreviate_dirs,\ $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \ -o $(1) \ `cat $${DYLIB_FILE}` \ + $(if $(filter Executable,$(TARGETTYPE)),\ + $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Executable $(LAYER) $(1) ) \ $(if $(filter Library CppunitTest,$(TARGETTYPE)),\ $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Library $(LAYER) $(1) \ ln -sf $(1) $(patsubst %.dylib,%.jnilib,$(1)) ) \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 7 commits - bug/bug bug/bug.xhtml bug/component_comments.xsl bug/components.xsl bug/query.pl bug/subcomponents.xsl
bug/bug.xhtml | 115 +++--- bug/bug/bug.css | 278 +++--- bug/bug/bug.js| 49 +++-- bug/bug/images/description.png|binary bug/bug/images/error-bottom-left.png |binary bug/bug/images/error-bottom-right.png |binary bug/bug/images/error-bottom.png |binary bug/bug/images/error-left.png |binary bug/bug/images/error-right.png|binary bug/bug/images/error-top-left.png |binary bug/bug/images/error-top-right.png|binary bug/bug/images/error-top.png |binary bug/bug/images/login-container.png|binary bug/bug/images/login-input.png|binary bug/bug/images/signin-hover.png |binary bug/bug/images/signin.png |binary bug/bug/images/subject.png|binary bug/bug/images/submit-hover.png |binary bug/bug/images/submit.png |binary bug/bug/images/upload-hover.png |binary bug/bug/images/upload.png |binary bug/bug/skin.js | 61 +++ bug/component_comments.xsl| 11 - bug/components.xsl| 33 +++- bug/query.pl | 32 +++ bug/subcomponents.xsl |4 26 files changed, 446 insertions(+), 137 deletions(-) New commits: commit 1b20ec920288d88e1ede17b3cc180665e8893431 Author: Loic Dachary l...@dachary.org Date: Tue Sep 20 00:41:52 2011 +0200 attachment integration diff --git a/bug/bug.xhtml b/bug/bug.xhtml index f8554f4..94e74b7 100644 --- a/bug/bug.xhtml +++ b/bug/bug.xhtml @@ -134,17 +134,23 @@ /div div class=state_attach + div class=attach-invite Upload an attachment illustrating the problem + /div form action='/attachment.cgi' method='post' enctype='multipart/form-data' input type=hidden name=action value=insert/input input class=bug type=hidden name=bugid/input input type=hidden name=description value=SCREENSHOT/input -input type=hidden name=comment value=SCREENSHOT/input +input type=hidden name=comment value=SCREENSHOT COMMENT/input input type=hidden name=contenttypemethod value=autodetect/input -input type=file name=data/input -input type=submit value=Upload/input + div class=attach-file + input type=file name=data/input + /div + div class=attach-submit + input type=submit value=Upload/input + /div /form - img title=SCREENSHOT / + img title=screenshot / /div /div diff --git a/bug/bug/bug.css b/bug/bug/bug.css index d5d983c..ef22aa5 100644 --- a/bug/bug/bug.css +++ b/bug/bug/bug.css @@ -377,11 +377,46 @@ body { /* state_success */ .state_success { display: none; +text-align: center; +padding: 30px; +font-weight: bold; +} + +.state_success a { +color: #025587; +} + +.state_success a:hover { +color: #29a1e0; } /* state_attach */ .state_attach { display: none; +text-align: center; +} + +.state_attach .attach-invite { +color: #18a403; +padding: 10px; +} + +.state_attach .attach-submit input { +margin-left: auto; +margin-right: 40px; +background: url('images/upload.png') no-repeat; +width: 163px; +height: 49px; +font-weight: bold; +font-size: 20px; +color: #fff; +text-align: center; +line-height: 49px; +border: 0; +} + +.state_attach .attach-submit input:hover { +background: url('images/upload-hover.png') no-repeat; } /* skin */ diff --git a/bug/bug/images/upload-hover.png b/bug/bug/images/upload-hover.png new file mode 100644 index 000..886c540 Binary files /dev/null and b/bug/bug/images/upload-hover.png differ diff --git a/bug/bug/images/upload.png b/bug/bug/images/upload.png new file mode 100644 index 000..886c540 Binary files /dev/null and b/bug/bug/images/upload.png differ commit c71f8f3fbfb1c8b6284086562728e9befe4527ad Author: Loic Dachary l...@dachary.org Date: Tue Sep 20 00:14:29 2011 +0200 integrate the error message diff --git a/bug/bug.xhtml b/bug/bug.xhtml index ad61d5f..f8554f4 100644 --- a/bug/bug.xhtml +++ b/bug/bug.xhtml @@ -42,6 +42,24 @@ /div /div div class=right + + div class=error-container + div class=error-top +div class=error-left + div class=error-bottom +div class=error-right + div class=error-top-left/div + div class=error-top-right/div + div class=error-bottom-left/div + div class=error-bottom-right/div + div class=error + /div +/div + /div +/div + /div +/div + div class=username/div @@ -129,23 +147,6 @@
[Libreoffice-commits] .: 2 commits - automation/Executable_miniapp.mk automation/Executable_testtool.mk RepositoryFixes.mk Repository.mk set_soenv.in solenv/inc vcl/StaticLibrary_vclmain.mk
Repository.mk |1 - RepositoryFixes.mk|4 automation/Executable_miniapp.mk |2 +- automation/Executable_testtool.mk |2 +- set_soenv.in |4 +--- solenv/inc/_tg_app.mk | 20 ++-- solenv/inc/tg_app.mk |2 +- solenv/inc/unxgcc.mk |1 - solenv/inc/unxiosr.mk |2 -- solenv/inc/unxmacx.mk |1 - solenv/inc/unxsogi.mk |1 - solenv/inc/unxsogs.mk |1 - solenv/inc/unxsoli4.mk|2 -- solenv/inc/unxsols4.mk|2 -- solenv/inc/unxsolu4.mk|2 -- solenv/inc/wntgcci.mk |1 - solenv/inc/wntmsc.mk |1 - vcl/StaticLibrary_vclmain.mk | 18 -- 18 files changed, 14 insertions(+), 53 deletions(-) New commits: commit f62a449a53a73db81768082b89f3b9db466af460 Author: Jan Holesovsky ke...@suse.cz Date: Tue Sep 20 00:49:49 2011 +0200 Kill the explicit linking to salmain.o, use vclmain instead. diff --git a/Repository.mk b/Repository.mk index 950a239..175adbd 100644 --- a/Repository.mk +++ b/Repository.mk @@ -361,7 +361,6 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ libeay32 \ ssleay32 \ ooopathutils \ - salmain \ sample \ salcpprt \ vclmain \ diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index aa37877..16f1c8f 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -39,9 +39,6 @@ gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salh gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst ucb:libucb%,ucb:libucb1%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst ucpfile:libucpfile%,ucpfile:libucpfile1%,$(gb_Library_FILENAMES)) - -# TODO: this is a hack; we should really build salmain as a regular static library -gb_StaticLibrary_FILENAMES := $(subst salmain:libsalmain.a,salmain:salmain.o,$(gb_StaticLibrary_FILENAMES)) endif ifeq ($(OS),WNT) @@ -59,7 +56,6 @@ gb_Library_FILENAMES := $(patsubst tl:itl%,tl:itools%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES)) gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES)) -gb_StaticLibrary_FILENAMES := $(subst salmain:salmain.lib,salmain:salmain.obj,$(gb_StaticLibrary_FILENAMES)) ifeq ($(COM),GCC) gb_Library_FILENAMES := $(patsubst crypto:icrypto%,crypto:crypto%,$(gb_Library_FILENAMES)) diff --git a/automation/Executable_miniapp.mk b/automation/Executable_miniapp.mk index 7ddd9d9..e9ae6f1 100644 --- a/automation/Executable_miniapp.mk +++ b/automation/Executable_miniapp.mk @@ -54,7 +54,7 @@ $(eval $(call gb_Executable_add_linked_libs,miniapp,\ )) $(eval $(call gb_Executable_add_linked_static_libs,miniapp,\ -salmain \ +vclmain \ )) $(eval $(call gb_Executable_add_exception_objects,miniapp,\ diff --git a/automation/Executable_testtool.mk b/automation/Executable_testtool.mk index 8d9327c..0d782c7 100644 --- a/automation/Executable_testtool.mk +++ b/automation/Executable_testtool.mk @@ -69,7 +69,7 @@ $(eval $(call gb_Executable_add_linked_libs,testtool,\ $(eval $(call gb_Executable_add_linked_static_libs,testtool,\ app \ -salmain \ +vclmain \ sample \ )) diff --git a/solenv/inc/_tg_app.mk b/solenv/inc/_tg_app.mk index 4a98fae..b5a7956 100644 --- a/solenv/inc/_tg_app.mk +++ b/solenv/inc/_tg_app.mk @@ -32,7 +32,7 @@ APP1STACKN= .IF $(APP1NOSAL)== .IF $(TARGETTYPE) == GUI -APP1OBJS+= $(STDOBJVCL) +APP1STDLIB+= -lvclmain .ENDIF .ENDIF @@ -242,7 +242,7 @@ APP2STACKN= .IF $(APP2NOSAL)== .IF $(TARGETTYPE) == GUI -APP2OBJS+= $(STDOBJVCL) +APP2STDLIB+= -lvclmain .ENDIF .ENDIF @@ -452,7 +452,7 @@ APP3STACKN= .IF $(APP3NOSAL)== .IF $(TARGETTYPE) == GUI -APP3OBJS+= $(STDOBJVCL) +APP3STDLIB+= -lvclmain .ENDIF .ENDIF @@ -662,7 +662,7 @@ APP4STACKN= .IF $(APP4NOSAL)== .IF $(TARGETTYPE) == GUI -APP4OBJS+= $(STDOBJVCL) +APP4STDLIB+= -lvclmain .ENDIF .ENDIF @@ -872,7 +872,7 @@ APP5STACKN= .IF $(APP5NOSAL)== .IF $(TARGETTYPE) == GUI -APP5OBJS+= $(STDOBJVCL) +APP5STDLIB+= -lvclmain .ENDIF .ENDIF @@ -1082,7 +1082,7 @@ APP6STACKN= .IF $(APP6NOSAL)== .IF $(TARGETTYPE) == GUI -APP6OBJS+= $(STDOBJVCL) +APP6STDLIB+= -lvclmain .ENDIF .ENDIF @@ -1292,7 +1292,7 @@ APP7STACKN= .IF $(APP7NOSAL)== .IF $(TARGETTYPE) == GUI -APP7OBJS+= $(STDOBJVCL) +APP7STDLIB+= -lvclmain .ENDIF .ENDIF @@ -1502,7 +1502,7 @@ APP8STACKN= .IF $(APP8NOSAL)== .IF $(TARGETTYPE) == GUI -APP8OBJS+= $(STDOBJVCL) +APP8STDLIB+= -lvclmain .ENDIF .ENDIF @@ -1712,7 +1712,7 @@ APP9STACKN= .IF $(APP9NOSAL)== .IF $(TARGETTYPE) == GUI -APP9OBJS+= $(STDOBJVCL) +APP9STDLIB+= -lvclmain
[Libreoffice-commits] .: 3 commits - sc/inc sc/source
sc/inc/document.hxx |8 +- sc/inc/table.hxx | 45 +++--- sc/source/core/data/documen3.cxx | 20 ++ sc/source/core/data/markdata.cxx |2 sc/source/core/data/table6.cxx | 122 ++- sc/source/ui/unoobj/cellsuno.cxx | 25 --- sc/source/ui/view/viewfun2.cxx | 17 - 7 files changed, 124 insertions(+), 115 deletions(-) New commits: commit 0783e78de2ce265e19b739effbff80c37ee98576 Author: Kohei Yoshida kohei.yosh...@suse.com Date: Mon Sep 19 19:09:19 2011 -0400 Let's avoid modifying the selection data during search and replace. The previous code was modifying the selection data (ScMarkData) in a not-so-obvious fashion during the search and/or replace. Let's only modify selection in the view code to avoid surprises. The document model shouldn't be modifying the view model. Those methods that were taking a reference to ScMarkData now take a const reference instead. diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 77439d1..ca98063 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -1260,10 +1260,10 @@ public: sal_uInt16 nFormatNo, const ScMarkData rMark ); voidGetAutoFormatData( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, ScAutoFormatData rData ); -sal_BoolSearchAndReplace( const SvxSearchItem rSearchItem, -SCCOL rCol, SCROW rRow, SCTAB rTab, -ScMarkData rMark, -String rUndoStr, ScDocument* pUndoDoc = NULL ); +boolSearchAndReplace( const SvxSearchItem rSearchItem, + SCCOL rCol, SCROW rRow, SCTAB rTab, + const ScMarkData rMark, ScRangeList rMatchedRanges, + rtl::OUString rUndoStr, ScDocument* pUndoDoc = NULL ); // determine Col/Row of subsequent calls // (e.g. not found from the beginning, or subsequent tables) diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 347b9cc..9cd3c57 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -498,9 +498,9 @@ public: sal_uInt16 nFormatNo ); voidGetAutoFormatData(SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, ScAutoFormatData rData); voidScReplaceTabsStr( String rStr, const String rSrch, const String rRepl ); // from sw -boolSearchAndReplace(const SvxSearchItem rSearchItem, -SCCOL rCol, SCROW rRow, ScMarkData rMark, -String rUndoStr, ScDocument* pUndoDoc); +boolSearchAndReplace( +const SvxSearchItem rSearchItem, SCCOL rCol, SCROW rRow, const ScMarkData rMark, +ScRangeList rMatchedRanges, rtl::OUString rUndoStr, ScDocument* pUndoDoc); voidFindMaxRotCol( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCOL nX2 ); @@ -819,33 +819,36 @@ private: voidGetAutoFormatAttr(SCCOL nCol, SCROW nRow, sal_uInt16 nIndex, ScAutoFormatData rData); voidGetAutoFormatFrame(SCCOL nCol, SCROW nRow, sal_uInt16 nFlags, sal_uInt16 nIndex, ScAutoFormatData rData); boolSearchCell(const SvxSearchItem rSearchItem, SCCOL nCol, SCROW nRow, - const ScMarkData rMark, String rUndoStr, ScDocument* pUndoDoc); + const ScMarkData rMark, rtl::OUString rUndoStr, ScDocument* pUndoDoc); boolSearch(const SvxSearchItem rSearchItem, SCCOL rCol, SCROW rRow, - const ScMarkData rMark, String rUndoStr, ScDocument* pUndoDoc); -boolSearchAll(const SvxSearchItem rSearchItem, ScMarkData rMark, -String rUndoStr, ScDocument* pUndoDoc); + const ScMarkData rMark, rtl::OUString rUndoStr, ScDocument* pUndoDoc); +boolSearchAll(const SvxSearchItem rSearchItem, const ScMarkData rMark, + ScRangeList rMatchedRanges, rtl::OUString rUndoStr, ScDocument* pUndoDoc); boolReplace(const SvxSearchItem rSearchItem, SCCOL rCol, SCROW rRow, -const ScMarkData rMark, String rUndoStr, ScDocument* pUndoDoc); -boolReplaceAll(const SvxSearchItem rSearchItem, ScMarkData rMark, -String rUndoStr, ScDocument* pUndoDoc); +const ScMarkData rMark, rtl::OUString rUndoStr, ScDocument* pUndoDoc); +boolReplaceAll( +const SvxSearchItem rSearchItem, const ScMarkData rMark, ScRangeList rMatchedRanges, +rtl::OUString rUndoStr, ScDocument* pUndoDoc); boolSearchStyle(const SvxSearchItem
[Libreoffice-commits] .: desktop/Package_scripts.mk
desktop/Package_scripts.mk |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit 8033c5093ee57b3896e40a83e9b3c8560b31b160 Author: David Tardon dtar...@redhat.com Date: Tue Sep 20 06:51:13 2011 +0200 soffice.sh should not be delivered on MacOS diff --git a/desktop/Package_scripts.mk b/desktop/Package_scripts.mk index 9292940..1bc67b7 100644 --- a/desktop/Package_scripts.mk +++ b/desktop/Package_scripts.mk @@ -33,10 +33,15 @@ $(eval $(call gb_Package_add_file,desktop_scripts,bin/sdraw,sdraw.sh)) $(eval $(call gb_Package_add_file,desktop_scripts,bin/simpress,simpress.sh)) $(eval $(call gb_Package_add_file,desktop_scripts,bin/smaster,smaster.sh)) $(eval $(call gb_Package_add_file,desktop_scripts,bin/smath,smath.sh)) -$(eval $(call gb_Package_add_file,desktop_scripts,bin/soffice,soffice.sh)) $(eval $(call gb_Package_add_file,desktop_scripts,bin/sweb,sweb.sh)) $(eval $(call gb_Package_add_file,desktop_scripts,bin/swriter,swriter.sh)) $(eval $(call gb_Package_add_file,desktop_scripts,bin/unoinfo,unoinfo.sh)) $(eval $(call gb_Package_add_file,desktop_scripts,bin/unopkg,unopkg.sh)) +ifneq ($(OS),MACOSX) + +$(eval $(call gb_Package_add_file,desktop_scripts,bin/soffice,soffice.sh)) + +endif + # vim: set ts=4 sw=4 et: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/platform/macosx.mk |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit ff1c626fa1380c7af5a135f80b45de7e62025eed Author: Norbert Thiebaud nthieb...@gmail.com Date: Tue Sep 20 00:01:41 2011 -0500 do not call macosx-change-install-name for NONEBIN executable diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index e30201b..cabf855 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -338,8 +338,9 @@ $(call gb_Helper_abbreviate_dirs,\ -o $(1) \ `cat $${DYLIB_FILE}` \ $(if $(filter Executable,$(TARGETTYPE)), \ +$(if $(filter-out NONEBIN,$(LAYER)), \ $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Executable \ -$(LAYER) $(1) ) \ +$(LAYER) $(1) )) \ $(if $(filter Library CppunitTest,$(TARGETTYPE)),\ $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Library $(LAYER) $(1) \ ln -sf $(1) $(patsubst %.dylib,%.jnilib,$(1)) ) \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice] 随王下tf世几多年,轮迷中忘前缘;神、韵呼唤主返,莫迷红尘忘家园
阎半梦, 都说流星有求必应我愿意守在星空之下,等到一颗星星被我感畛动,划破长空,载着我的祝福落在你枕边,祝你永远幸福快乐 常常听到人们说这样的话,“我知道仲供过去谎话连篇,但这一次他说的是真的”。具有讽刺意味的是,如果把时光倒流,在很多次仲供历、史上犯错误的重大时刻,人们说的都是这样的话。这就是仲供几十年来练就的欺、骗人、民的谎、言本领。由于人们对“放卫星”式的谎、言有了些抵抗,力,于是仲供的谎、言宣、传也走向了“精致化”“专业化”的道路。谎、言从过去的口号式宣、传变得更加“循序渐进”、“细致入微”,特别是在信息封,锁下,用基于某些片面“事实”的谎、言来误导民、众,其危害比“放卫星”更具迷、惑性。 请看发给您的文件 最简单的长寿秘决保持呼吸,不要断气.RAR Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] gbuild question
On 09/17/2011 06:19 AM, Norbert Thiebaud wrote: On Fri, Sep 16, 2011 at 7:07 PM, Peter Foleypefol...@verizon.net wrote: I'm working on converting soltools to gbuild but I've come across a problem. soltools/testhxx/makefile.mk echos the commandline to compile a cxx file to a temporary file and then runs it through a perl script. What I need is a way to get the command line used to compile a file with out actually executing it. With dmake this seems to be accomplished with CAPTURE_COMMAND but I haven't been able to find equivalent funcionality in gbuild. A pointer would be appreciated. Peter, The first question you should ask youself is: is this thing actually used somewhere [...] Apparently the answer is.. no. testhxx was invented at the time we made the code warning free, and started with cleaning up the headers. It allowed to compile just a given header, with all the command line arguments of a normal compiler call. That said, it has probably not been used lately, probably rotted, and if we ever feel a need for it again, we could create a new one from scratch in the context of the new build system. So, the old one can probably be removed now. -Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [LibreOffice] exclude .ppm's from opengrok?
On Sat, 2011-09-17 at 21:57 +0200, Chr. Rossmanith wrote: Hi, is it intended that opengrok looks for a pattern in .ppm's ? I've been searching for lcl with opengrok and found london.ppm. Why not... If there are other files types to ignore, don't hesitate to tell me. However I'll need to have a deeper look at the opengrok config to see how easy it would be to ignore some files patterns. -- Cédric Bosdonnat LibreOffice hacker http://documentfoundation.org OOo Eclipse Integration developer http://cedric.bosdonnat.free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Debian gcc or LO bug
On 09/18/2011 11:23 PM, julien2412 wrote: Hello, On LO-dev IRC, i met someone with this pb /home/luc/git/core/vcl/unx/gtk/a11y/atkutil.cxx:322:60: error: call of overloaded ‘insert(com::sun::star::uno::Referencecom::sun::star::accessibility::XAccessibleEventBroadcaster)’ is ambiguous detail logs : [ build CXX ] vcl/unx/gtk/a11y/atkutil R=/home/luc/git S=$R/core O=$S/solver/unxlngx6.pro W=$S/workdir/unxlngx6.pro mkdir -p $W/CxxObject/vcl/unx/gtk/a11y/ $W/Dep/CxxObject/vcl/unx/gtk/a11y/ ccache g++ -DCPPU_ENV=gcc3 -DCUI -DENABLE_GRAPHITE -DENABLE_GTK -DENABLE_LAYOUT=0 -DENABLE_LAYOUT_EXPERIMENTAL=0 -DGCC -DGXX_INCLUDE_PATH=/usr/include/c++/4.6 -DHAVE_GCC_VISIBILITY_FEATURE -DLINUX -DNDEBUG -DOPTIMIZE -DOSL_DEBUG_LEVEL=0 -DPRODUCT -DPRODUCT_FULL -DSOLAR_JAVA -DSUPD=350 -DUNIX - DUNX -DVCL -DX86_64 -D_PTHREADS -D_REENTRANT -DVCLPLUG_GTK_IMPLEMENTATION -DVERSION=\350m1\ -Wall -Wendif-labels -Wextra -Wshadow -Woverloaded-virtual -Wno-non-virtual-dtor -fPIC -fmessage-length=0 -fno-common -pipe -fvisibility=hidden -fvisibility-inlines-hidden -std=c++0x -Wno-deprecated-declarations -DEXCEPTIONS_ON -fexceptions -fno-enforce-eh-specs -O2 -c $S/vcl/unx/gtk/a11y/atkutil.cxx -o $W/CxxObject/vcl/unx/gtk/a11y/atkutil.o -MMD -MT $W/ CxxObject/vcl/unx/gtk/a11y/atkutil.o -MP -MF $W/Dep/CxxObject/vcl/unx/gtk/a11y/atkutil.d -I$S/vcl/unx/gtk/a11y/ -I$O/inc/stl -I$O/inc/external -I$O/inc -I$S/solenv/unxlngx6/inc -I$S/solenv/inc -I$S/res -I$S/solenv/inc/Xp31 -I/usr/lib/jvm/java-6-openjdk-amd64/include -I/usr/lib/jvm/java-6-openjdk-amd64/include/linux -I/usr/lib/jvm/java-6-openjdk-amd64/include/native_threads/include -I$S/vcl/inc -I$S/vcl/inc/pch -I$S/solenv/inc -I$O/inc -I$O/inc/offapi -I$O/ inc/udkapi -pthread -I/usr/include/gtk-2.0 -I/usr/lib/x86_64-linux-gnu/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/cairo -I/usr/include/gio-unix-2.0/ -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include /home/luc/git/core/vcl/unx/gtk/a11y/atkutil.cxx: In member function ‘void DocumentFocusListener::attachRecursive(const com::sun::star::uno::Referencecom::sun::star::accessibility::XAccessible, const com::sun::star::uno::Referencecom::sun::star::accessibility::XAccessibleContext, const com::sun::star::uno::Referencecom::sun::star::accessibility::XAccessibleStateSet)’: /home/luc/git/core/vcl/unx/gtk/a11y/atkutil.cxx:322:60: error: call of overloaded ‘insert(com::sun::star::uno::Referencecom::sun::star::accessibility::XAccessibleEventBroadcaster)’ is ambiguous /home/luc/git/core/vcl/unx/gtk/a11y/atkutil.cxx:322:60: note: candidates are: /usr/include/c++/4.6/bits/stl_set.h:407:7: note: std::pairtypename std::_Rb_tree_Key, _Key, std::_Identity_Key, _Compare, typename _Alloc::rebind_Key::other::const_iterator, bool std::set_Key, _Compare, _Alloc::insert(const value_type) [with _Key = com::sun::star::uno::Referencecom::sun::star::uno::XInterface, _Compare = std::lesslt;com::sun::star::uno::Referencelt;com::sun::star::uno::XInterfacegt; , _Alloc = std::allocatorcom::sun::star::uno:: Referencecom::sun::star::uno::XInterface , typename std::_Rb_tree_Key, _Key, std::_Identity_Key, _Compare, typename _Alloc::rebind_Key::other::const_iterator = std::_Rb_tree_const_iteratorlt;com::sun::star::uno::Referencelt;com::sun::star::uno::XInterfacegt; , std::set_Key, _Compare, _Alloc::value_type = com::sun::star::uno::Referencecom::sun::star::uno::XInterface] /usr/include/c++/4.6/bits/stl_set.h:416:7: note: std::pairtypename std::_Rb_tree_Key, _Key, std::_Identity_Key, _Compare, typename _Alloc::rebind_Key::other::const_iterator, bool std::set_Key, _Compare, _Alloc::insert(std::set_Key, _Compare, _Alloc::value_type) [with _Key = com::sun::star::uno::Referencecom::sun::star::uno::XInterface, _Compare = std::lesslt;com::sun::star::uno::Referencelt;com::sun::star::uno::XInterfacegt; , _Alloc = std:: allocatorlt;com::sun::star::uno::Referencelt;com::sun::star::uno::XInterfacegt; , typename std::_Rb_tree_Key, _Key, std::_Identity_Key, _Compare, typename _Alloc::rebind_Key::other::const_iterator = std::_Rb_tree_const_iteratorlt;com::sun::star::uno::Referencelt;com::sun::star::uno::XInterfacegt; , std::set_Key, _Compare, _Alloc::value_type = com::sun::star::uno::Referencecom::sun::star::uno::XInterface] The value_type rvalue reference in the second alterntive indicates that the given GCC and standard library already support C++11 rvalue references and move semantics. I am not sure whether it is indeed the case per the Standard wording, but this apparently lets at least claim the given GCC implementation that the given LibO code is ambiguous: From ReferenceXBroadcaster to insert(ReferenceXInterfaceconst), there always has been a conversion route via ReferenceXBroadcaster::operator ReferenceXInterfaceconst(). I assume the given GCC thinks that there is an additional, longer route, from
[Libreoffice] [PUSHED] Re: idlc/gbuild baddness and leaked /tmp files...
Hi Matus, On 2011-09-08 at 13:38 +0200, Matúš Kukan wrote: as it turned out there was massive leakage fo file in the temp directory with each build.. 150 or so per build... after a while mktemp was running out of filename and working very-very hard to find an empty slot. Another missing $, this should fix it: define gb_UnoApiPartTarget__command $$(call gb_Output_announce,$(2),$(true),IDL,2) mkdir -p $(call gb_UnoApiPartTarget_get_target,$(2)) \ - RESPONSEFILE=$$(call var2file,$(shell $(gb_MKTEMP)),500,\ + RESPONSEFILE=$$(call var2file,$$(shell $(gb_MKTEMP)),500,\ $$(call gb_Helper_convert_native,$$(INCLUDE) $$(DEFS) -O $(call gb_UnoApiPartTarget_get_target,$(2)) -verbose -C $$?)) \ $(gb_UnoApiTarget_IDLCCOMMAND) @{RESPONSEFILE} /dev/null \ rm -f {RESPONSEFILE} \ Thank you for that! :-) Fixes the problem for me. I've re-applied your patches + this one, and pushed. Regards, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Your message to Libreoffice-commits awaits moderator approval
Norbert Thiebaud wrote: Does someone know how I can get added to the libreoffice-commits list so I don't get annoying bounces like the above? Thorsten should be able to help with that... CC-ing him The commit list is manual-subscribe, so all new committers, please expect your first commits to hit moderation queue - I manually white-list you folks when I see that. Sorry for the lag in this case, didn't get to the moderation mailbox yesterday ... Cheers, -- Thorsten pgplqYWubX3vx.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [FIXED] helpex tool is broken
On Fri, 2011-09-16 at 23:14 +0200, Andras Timar wrote: Hi Caolan, ... helpex tool does not work as expected ... Could you please check what went wrong? Went wrong with my 13caa83dca4e1507a6e0213bd122d13af570d132 I removed the redundant charset parameter of MergeDataFile::MergeDataFile, so it went from a five argument ctor with one terminal default argument to a four argument ctor with one terminal default argument. i.e. -MergeDataFile( const ByteString rFileName, const ByteString rFile , sal_Bool bErrLog, CharSet aCharSet, bool bCaseSensitive = false ); +MergeDataFile( const ByteString rFileName, const ByteString rFile, bool bErrLog, bool bCaseSensitive = false ); I had *thought* I had converted all callers, but I missed the helpex one so its call of MergeDataFile(sSDFFile, sInputFile, sal_False, RTL_TEXTENCODING_MS1252) used to call, due to the default argument MergeDataFile(sSDFFile, sInputFile, sal_False, RTL_TEXTENCODING_MS1252, false) but after removal of the charset argument in MergeDataFile::MergeDataFile the unchanged line of MergeDataFile(sSDFFile, sInputFile, sal_False, RTL_TEXTENCODING_MS1252); no longer expands to MergeDataFile(sSDFFile, sInputFile, sal_False, RTL_TEXTENCODING_MS1252, false); but instead the charset arg is used to override the default argument, i.e. MergeDataFile(sSDFFile, sInputFile, sal_False, true); so bCaseSensitive went from false to true, *splat* Should be fixed with commit ec303dfe52f7ba78ffba2a5327fda38abfef5d6f Let me know if that doesn't work. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Windows builds with Visual Studio Express
agree that at least for the first part reimplementing would be a good idea, and in fact I once had planned to do that. Admittedly it was never important enough. Not like it is a top priority now, but if you have some spare time, a patch would not be refused :) Another interesting question is if some of those bits are actually used by someone. I am sure we want the OLE drag and drop support, but would it be *THAT* bad if we remove the ActiveX control, for example? ;) -- Jesús Corrius je...@softcatala.org Document Foundation founding member Mobile: +34 661 11 38 26 Skype: jcorrius | Twitter: @jcorrius ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Linux plumbers 2011: large application startup slidedeck
Hi there, On Wed, 2011-09-14 at 10:48 +0100, Caolán McNamara wrote: Taras Glek's slidedeck about firefox, etc. startup performance http://people.mozilla.com/~tglek/lpc2011/ So - Taras and I talk reasonably regularly on some of these topics so I don't think we're too far behind the plan here ;-) Some goodies. On the relatively low-hanging fruit side of things... b) fadvise(WILLNEED) before dlopen ? our SUSE / libc does this and it has a real win, so we don't do that, and as Stephan says the pagein is still run: and then not re-run at second start (which was really dumb) - so we should have improved there. Covered by our pagein hackery, so given the apparent reluctance to add advise to ld.so, we will have to keep it around for now... the real problem is that we have really -a-lot- of libraries to load. Simply linking them all into one big library not only helps us do good LTO to save size, but should really speed up I/O by having a single large contiguous library on disk: with more in it's 'cold' 'hot' etc. sections. This is what Matus was working towards as GSOC - and when we have desktop + scripting gbuildized - hopefully we can get svx and sfx2 into tail_build and make that one-big-library a reality. Though the pagein list was created once, and isn't really reviewed regularly ? I poke it now then, but you're right - it'd be nicer if we had fewer libraries and they didn't change name now and then ;-) well worth reviewing to check that it matches what we load on startup. as an aside, what's the current preferred/best way for startup measurement ? Catching the very early linking / init is hard - as Taras says we prolly want to steal some Mozilla code to do that (which can measure from the fork if not execve. I tended to do the: export RTL_LOGFILE=/tmp/startup.nopid; rm -f $RTL_LOGFILE; ./soffice -writer and cat the startup.nopid. Of course using: export OOO_EXIT_POST_STARTUP=1 export OOO_DISABLE_RECOVERY=1 Would probably allow us to do this headless - using the svp backend on a server somewhere in a little loop :-) Then again svp has performance issues all of its own - and much of our problem is not warm start but cold start time which is ~impossible to measure deterministically (sadly). ATB, Michael. -- michael.me...@novell.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Java baseline is 1.5, right?
Can we keep it in with a 'use at your own risk and peril'? I don't think that spending energy on 1.4 bugs is wise, but if someone finds them, let 'em fix. -- Marc-André Laverdière Software Security Scientist Innovation Labs, Tata Consultancy Services Hyderabad, India On Thu 15 Sep 2011 07:15:06 PM IST, Bjoern Michaelsen wrote: On Thu, 15 Sep 2011 15:38:04 +0200 Fridrich Strba fridrich.st...@graduateinstitute.ch wrote: Hello, Michael, On 15/09/11 15:06, Michael Stahl wrote: just noticed David's commit to move around the fix for a broken IBM LinuxPPC JRE: http://cgit.freedesktop.org/libreoffice/core/commit/?id=ab5ce3f70a5635c3ca141b5c8928a104b522e1bb AFAIK the OOo JRE baseline was raised to 1.5 some years ago, right? so 1.4 seems obsolete and we can get rid of it now? No real baseline for us here. It is true that our release builds for linux, we build them with --with-java-target-version=1.5 using 1.6 as javac. Nevertheless, if a fix for 1.4 is reasonably cheap, it cannot be bad to keep it building. OTOH 'mostly working on 1.4' doesnt help anybody and creates useless bug traffic -- better clearly state its unsupported and be done with it. And even small fixes for obsolete stuff can stack quite high (just look at all the Win16 optimizations in the codebase). Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PUSHED] fdo#38391: don't crash while dropping texture
On Sun, 2011-09-18 at 00:32 -0700, Ivan Timofeev wrote: and preferably add a link to that in the wiki here: http://wiki.documentfoundation.org/Development/Developers ] Yes, surely I can. But I think that Developers page is for those people who makes more significant contribution than me. Not at all - it's to help us not badger people when they forget license footers with each commit - and we're trying to build it out - and hey: every bug fix is significant ! :-) we love them. Should we back-port this to LibreOffice 3.4 ? Yes, do it please. Pushed to libreoffice-3-4 should be in 3.4.next. Thanks ! Michael. -- michael.me...@novell.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] Improving saving information icon in status bar (#39430)
Hello! I had resent this letter because there are no answers to my patch in mailing list after one week. Hello! I attached two patches (= 2 commits). Improvement: #39430 (http://bugs.freedesktop.org/show_bug.cgi?id=39430) Author: Dmitry Ashkadov License: LGPLv3/MPL Should I close bug #39430 ? Thank You. -- Best Regards, Dmitry From 3bd23342be1f14b428a96cfb2cdb81bc746c1e32 Mon Sep 17 00:00:00 2001 From: Dmitry Ashkadov dmitry.ashka...@gmail.com Date: Mon, 12 Sep 2011 18:57:42 +0400 Subject: [PATCH 1/2] #39430: Saving Information Icon in the Status Bar was improved. --- default_images/svx/res/doc_modified_feedback.png | Bin 0 - 462 bytes default_images/svx/res/doc_modified_no_14.png| Bin 429 - 369 bytes default_images/svx/res/doc_modified_yes_14.png | Bin 506 - 462 bytes svx/inc/svx/dialogs.hrc |9 +- svx/inc/svx/modctrl.hxx |9 ++ svx/source/stbctrls/modctrl.cxx | 88 -- svx/source/stbctrls/stbctrls.src | 10 ++- 7 files changed, 89 insertions(+), 27 deletions(-) create mode 100644 default_images/svx/res/doc_modified_feedback.png diff --git a/default_images/svx/res/doc_modified_feedback.png b/default_images/svx/res/doc_modified_feedback.png new file mode 100644 index ..1fa1f7421d48a207aa2a90957b8b8a49ed87296d GIT binary patch literal 462 zcmV;0WtoGP)h;3K|Lk000e1NJLTq000gE000XJ1^@s6Pldc4b3#c}2nYxW zdbNS9a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^ zaAhuUa%Y?FJQ@H10ZU0lK~yM_jgm1-LQxdQe_g#8`T~aroeZK71BaHTrXUnTFz_4H zqgr0Lj*7ClKz|2WShV;60H1O|mo1rAb6b|3Y6=C#Q(Eb2F%!}R!#QL9ejfm zbpXWp;?7#TbmZw*7^p0hyGae(MhFs79HY})PiRJ~q5)mkrEYuAJjbzovJ7yLph zm7-WICZ{~5aLw`u?#f-6bEvtR7y%IJ!@^Kl*;}~e13l-NW4%kmy=RTPis9tB8FiI zfbI9VHVps{?rZEfcX1qtLZOiCcDsioqVM|v?A`8Cy;|e!@tBi`BQ~bD2x}z(`k$` zQzN1=27t}!9cE%Vwl3CjGgW4t9IaOCTLy;CVT_^Ik$c~?9bIWpYKrEYfH+2!h~u z(f55KkqGg49DwD_3IO?hp5e?-8{aCG%JApL@+2m0ACS-(yir=wEzGB07*qoM6N$ EfTVS^xk5 literal 0 HcmV?d1 diff --git a/default_images/svx/res/doc_modified_no_14.png b/default_images/svx/res/doc_modified_no_14.png index cc9d6f58155cb66b140aa41415a0f04d16795e11..2fbd22e956f94a45157d8b6cb9e3c32ec1178d8f 100644 GIT binary patch delta 335 zcmV-V0kHn91Mvco7a9u)1^@s6Pldc4b3#c}2nYxWdbNSkw6%K8FWQhbW?9; zba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10PaadK~yM_jnOe~gD@Bc;Af0b1`i%G zxHs|z=oGb^k;oM~_6S|@*iKzLaU=$cDzK1cjNK(vGz7J8`Ypdt)-RJ7BLJYPswYAS z#U+H0uW6dz%d%{=)@J~J#~9;W6vZDq^lxTN-ak;O~dQDe$-mOdhb6dr6)p2w%jM! zi4X!(%0rfA4{4fuO6ePbp+Wc4k64+sh5AjYpk`t+d${sF6Nv=N_lY3-EW{VW*4?? z3n2uIF?7uVc3OT*KImK-_iFyLI@bg5!PB*Yk$p4X9JBfNRk99j4?3AZoa%;XAS2( h*@EZNsQ4i^EaJmaj6owVRQfh002ovPDHLkV1hIFh{ON@ delta 395 zcmV;60d)TH08m(7by-11^@s6A4o0H1b5ch_0Itp)=Px#24YJ`L;(K){{a7 zy{D6rFKXbbV*G`2ipVz6aoiMYpw?0013nR9JLFZ*6U5Zgcu(a%Ew3Wn_C zX@2HM@dakWG-a~00035NklZD9^ppy-tQO6b9h8rGcoit_-~$5(qPKPzMmJ2z} z0q(%~#lcJ9ei$4GL-`FMJx+YVAZlV_r0ubNl$-fd5`E%H2nA|k%^|o!F;y8ZK zvg{GS4P(qCN%9N;VoebdPm)Us;asw%Q7yC;0BTbAXXh%VPYKN|Tg)j^qA;cZ$ z+!$kCiAetl0l;-#_`ZKZM6nQprD^)|E4bny2pr3@9*Uw+J2=ntA(m3Y^E_u9$J-s$ zS|3-!x~`#=Lff|2JJ|RAA#9pvmpMO2*L7Hy1;a34nkG!s^rDmJE*mW5CT$4NGZSE pd3zkO8P!Bl^zAJ(#}7pIWPwbD3qp!GSS002ovPDHLkV1jr$p~(OM diff --git a/default_images/svx/res/doc_modified_yes_14.png b/default_images/svx/res/doc_modified_yes_14.png index e78de2384c0201224f9223bf753baadd1524f567..8a111d6532d08d489b3f3ff33be7b259a16a1f77 100644 GIT binary patch delta 429 zcmV;e0aE_@1I`1G7a9u)1^@s6Pldc4b3#c}2nYxWdbNSkw6%K8FWQhbW?9; zba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10ZU0lK~yM_ebT*313?sq;n$LO2n*% zKiMv6L=jOW7a$0dNGc(B5Qc!gMeOVZ+cbk0U}GTsg(5obxIl|HbzT#z|F)wFrrU z7{BTq~*F@%tRc=04Sw@LST~LyjW}ZDwWEEQtAm20Bv8DS*V#;G~pt(6rm_Oube zR!VJKYs*52Ixy3J7mP_dou*JI%(||7C4~4ALhJy||DpNr;rY1%w$?^c%H{F!^8-^| zgYO7aT_c?o1FV$V9Dz|3^@`L2Vxx#XJ3wp{A+#dF1o?*1Ogdp-iS*2GT@%E*A zz252O5D1|@O1BT;lsaK@em{U=RdMtZd=b-XWVqY?UFK!PUV}D3o`bi8!V+`TP zEAHI|9Nl9M*LlwD5{l$_sI|s%9H#v96y4SfRiSxhM$U)_-p7luD)HpYvD3e(?hy X%Y*}$*7flK8NkvXXu0mjfZfL|U delta 473 zcmV;~0Ve*=1NsAy7by-11^@s6A4o0H1b5ch_0Itp)=Px#24YJ`L;(K){{a7 zy{D6rFKXbbV*G`2ipVz6ay|uO`L-0013nR9JLFZ*6U5Zgcu(a%Ew3Wn_C zX@2HM@dakWG-a~0003|NklZD9^o;yGjF55Qe`!*IA)fbkNM1hMl0gouKTMAu} zc-ZKZzFb|m#`E}Cz!^{Cs5QhUXtdlaXr~RYh!+7%zq3R5Q%~%?vXG|836DQA!N} z_e1X9ah#nn3@?;YH$Vl*q9}6tBy__t90i?DXTH^Hohqfag%Ge+7n=Am1uTQZARN z*Xzv{o_2(Giz-fkDF6$lS%M%adY*SGgm9uLs(cGt^FX(~Mz6h2_pHj?bb%lU zr0;+GEu~a-3^c|7(7!r+#!9w1w=Z+($}DtyYu9n4{4`hK|-6(`(beKE!b)*aZ7 zNB4)Sf#wOi`IH^tYaL_{9w-D|-lk2E+uyDAjzS|(uX~saUHEEiXmzrc*M()ls zNK-DKwnmr1^4G*L9J_W#s1hTTRP?^L{1jFTpsDvqqy)_~p~mKmY10LfD1_=6;g~ P0NkvXXu0mjfE?3WO diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc index b10c4b3..d8e79ea 100755 --- a/svx/inc/svx/dialogs.hrc +++ b/svx/inc/svx/dialogs.hrc @@ -1156,9 +1156,10 @@ #define SVX_OOO_BUILD_START (RID_SVX_START + 1200) -#define RID_SVXBMP_DOC_MODIFIED_YES (SVX_OOO_BUILD_START + 1) -#define RID_SVXBMP_DOC_MODIFIED_NO
Re: [Libreoffice] Debian gcc or LO bug
Hi, On Sun, Sep 18, 2011 at 02:23:59PM -0700, julien2412 wrote: On LO-dev IRC, i met someone with this pb /home/luc/git/core/vcl/unx/gtk/a11y/atkutil.cxx:322:60: error: call of overloaded ‘insert(com::sun::star::uno::Referencecom::sun::star::accessibility::XAccessibleEventBroadcaster)’ is ambiguous Yes. Since gcc-4.6 (4.6.1-10) unstable; urgency=medium . * Update to SVN 20110910 (r178746) from the gcc-4_6-branch. - Fix PR middle-end/50266, PR tree-optimization/49911, PR tree-optimization/49518, PR tree-optimization/49628, PR tree-optimization/49628, PR target/50310, PR target/50289, PR c++/50255, PR c++/50309, PR c++/49267, PR libffi/49594. - Revert fix for PR middle-end/49886, causing PR middle-end/50295. Update to SVN 20110910 Since Luc_ has these same line on SID, why does it work for me and not for him ? Doesn't work for me either. (Stndard Debian package configuration). Are you sure you are on *completely* uptodate sid? Grüße/Regards, René -- .''`. René Engelhard -- Debian GNU/Linux Developer : :' : http://www.debian.org | http://people.debian.org/~rene/ `. `' r...@debian.org | GnuPG-Key ID: D03E3E70 `- Fingerprint: E12D EA46 7506 70CF A960 801D 0AA0 4571 D03E 3E70 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [Bug 35673] LibreOffice 3.4 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=35673 Bug 35673 depends on bug 37579, which changed state. Bug 37579 Summary: oosplash.bin crash https://bugs.freedesktop.org/show_bug.cgi?id=37579 What|Old Value |New Value Resolution||FIXED Status|REOPENED|RESOLVED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] FreeBSD share some failures with OSX
Here is a patch to avoid a unit test that fail the same on FreeBSD as on OSX (Apparently because of aKname don't know more about it yet) regards, Bapt From f3fa7cc001c4309e0dcbd94f0732e56c7d4bc8c9 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin b...@freebsd.org Date: Mon, 19 Sep 2011 13:55:04 +0200 Subject: [PATCH 3/5] FreeBSD has the same cppunit failure as OSX does --- sal/qa/osl/module/osl_Module.cxx |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sal/qa/osl/module/osl_Module.cxx b/sal/qa/osl/module/osl_Module.cxx index a7339b3..5e0c47f 100644 --- a/sal/qa/osl/module/osl_Module.cxx +++ b/sal/qa/osl/module/osl_Module.cxx @@ -294,7 +294,7 @@ namespace osl_Module // load lib which is under a CJK directory void load_002( ) { -#if defined( UNX ) !defined( MACOSX ) +#if defined( UNX ) !defined( MACOSX ) !defined( FREEBSD ) // TODO: Find out why this fails on Mac OS X //Can not get a CJK directory already exist, so here create one. Perhaps reason is encoding problem. ::rtl::OUString aPidDirURL = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(file:///tmp/)) + ::rtl::OUString::valueOf( ( long )getpid( ) ); -- 1.7.6 pgpE3wbu88KFe.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] use PREFIXDIR in create_tree.sh
use PREFIXDIR instead of hard coding /usr in create_tree.sh --- Bapt From 54636c9ca659736040e8cafed2c201815de2ffbd Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin b...@freebsd.org Date: Mon, 19 Sep 2011 13:56:26 +0200 Subject: [PATCH 4/5] Use PREFIXDIR when possible --- sysui/desktop/share/create_tree.sh | 22 +++--- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh index 141e9a1..a694f6d 100755 --- a/sysui/desktop/share/create_tree.sh +++ b/sysui/desktop/share/create_tree.sh @@ -42,31 +42,31 @@ if [ ${GNOMEDIR} ]; then chmod 0644 ${DESTDIR}/${GNOMEDIR}/share/application-registry/${PREFIX}.* fi -mkdir -p ${DESTDIR}/usr/bin +mkdir -p ${DESTDIR}$PREFIXDIR/bin test -n ${OFFICE_PREFIX} office_prefix=${OFFICE_PREFIX} || office_prefix=/opt office_root=${office_prefix}/${PREFIX} #this symlink is needed to have the API boostrap functions running right -ln -sf ${office_root}/program/soffice ${DESTDIR}/usr/bin/${PREFIX} +ln -sf ${office_root}/program/soffice ${DESTDIR}$PREFIXDIR/bin/${PREFIX} -cp printeradmin.sh ${DESTDIR}/usr/bin/${PREFIX}-printeradmin -chmod 0755 ${DESTDIR}/usr/bin/${PREFIX}-printeradmin +cp printeradmin.sh ${DESTDIR}$PREFIXDIR/bin/${PREFIX}-printeradmin +chmod 0755 ${DESTDIR}$PREFIXDIR/bin/${PREFIX}-printeradmin if test ${PREFIX} != libreoffice${PRODUCTVERSION} ; then # compat symlinks mkdir -p ${DESTDIR}${office_prefix} ln -sf libreoffice${PRODUCTVERSION} ${DESTDIR}${office_root} -ln -sf /usr/bin/${PREFIX} ${DESTDIR}/usr/bin/libreoffice${PRODUCTVERSION} -ln -sf /usr/bin/${PREFIX}-printeradmin ${DESTDIR}/usr/bin/libreoffice${PRODUCTVERSION}-printeradmin +ln -sf $PREFIXDIR/bin/${PREFIX} ${DESTDIR}$PREFIXDIR/bin/libreoffice${PRODUCTVERSION} +ln -sf $PREFIXDIR/bin/${PREFIX}-printeradmin ${DESTDIR}$PREFIXDIR/bin/libreoffice${PRODUCTVERSION}-printeradmin fi -mkdir -p ${DESTDIR}/usr/share/mime/packages -cp openoffice.org.xml ${DESTDIR}/usr/share/mime/packages/libreoffice${PRODUCTVERSION}.xml -chmod 0644 ${DESTDIR}/usr/share/mime/packages/libreoffice${PRODUCTVERSION}.xml +mkdir -p ${DESTDIR}$PREFIXDIR/share/mime/packages +cp openoffice.org.xml ${DESTDIR}$PREFIXDIR/share/mime/packages/libreoffice${PRODUCTVERSION}.xml +chmod 0644 ${DESTDIR}$PREFIXDIR/share/mime/packages/libreoffice${PRODUCTVERSION}.xml -mkdir -p ${DESTDIR}/usr/share/applications +mkdir -p ${DESTDIR}$PREFIXDIR/share/applications for i in `cat launcherlist`; do - ln -sf ${office_root}/share/xdg/${i} ${DESTDIR}/usr/share/applications/${PREFIX}-${i} + ln -sf ${office_root}/share/xdg/${i} ${DESTDIR}$PREFIXDIR/share/applications/${PREFIX}-${i} done -- 1.7.6 pgpkOua0n8aql.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATH] fix FreeBSD specific soenv entry
Some FreeBSD only fixes for soenv --- Bapt From ac0e87bf8cd604557eb541261816f87dd254f4de Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin b...@freebsd.org Date: Mon, 19 Sep 2011 13:57:23 +0200 Subject: [PATCH 5/5] Fix soenv for FreeBSD --- set_soenv.in |5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/set_soenv.in b/set_soenv.in index 5ffd45f..c36a45d 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -316,13 +316,13 @@ elsif ( $platform =~ m/freebsd/ ) $OS = FREEBSD; $PATH_SEPERATOR = $ps; $OSVERSION = '@OSVERSION@'; + $OUTPATH= 'unxfbsd'; + $oldoutfile = 'FreeBSDEnv.Set.sh'; if ($platform =~ m/^(amd64|x86_64)/) { my ( $JAVA_OS ); print Setting FreeBSD AMD64 specific values... ; - $oldoutfile = FreeBSDAMDEnv.Set.sh; $CPU= X; $CPUNAME= X86_64; - $OUTPATH= unxfbsdx; $JAVA_OS= '@JAVA_HOME@'; $JAVA_OS=~ s/.*\///; if ($JAVA_OS =~ m/^linux/) @@ -338,7 +338,6 @@ elsif ( $platform =~ m/freebsd/ ) } elsif ($platform =~ m/^i386/) { print Setting FreeBSD x86 specific values... ; - $oldoutfile = FreeBSDX86Env.Set.sh; $CPU= I; $CPUNAME= INTEL; $OUTPATH= unxfbsdi; -- 1.7.6 pgpQIeWB1Dofl.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Licensing information
I confirm that all my patches to LibreOffice are licensed under LGPL3+/GPL3+/MPL. Ivan Timofeev. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] use PREFIXDIR in distro-install-desktop-integration
Hi, Here is a patch to use $PREFIXDIR instead of hardcoding /usr in the deistro-install-desktop-integration script. This is necessary to build on FreeBSD as libreoffice is not installed in /usr but we still want to use distro-install-desktop-integration. Of course, the patch is in the licenses that you prefers :) regards, Bapt From 18e18a49e359f964da10075147591e8c4074ef70 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin b...@freebsd.org Date: Mon, 19 Sep 2011 13:40:48 +0200 Subject: [PATCH] Use PREFIXDIR each time possible to allow installing where /usr is not the prefix --- bin/distro-install-desktop-integration | 26 +- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration index 80e5c4a..466a9ad 100755 --- a/bin/distro-install-desktop-integration +++ b/bin/distro-install-desktop-integration @@ -12,10 +12,10 @@ create_wrapper() echo Install $PREFIXDIR/bin/$1 if test -L $DESTDIR$PREFIXDIR/bin/$1 ; then -# do not overwrite /usr/bin/libreoffice symlink created by create_tree.sh +# do not overwrite $PREFIXDIR/bin/libreoffice symlink created by create_tree.sh # the symlink is necessary by java UNO components to find # the UNO installation using $PATH; this function used to be provided -# by /usr/bin/soffice symlink, see +# by $PREFIXDIR/bin/soffice symlink, see # http://udk.openoffice.org/common/man/spec/transparentofficecomponents.html # Note: if you want to support parallel installation of more OOo versions # you cannot include this link directly into the package @@ -87,7 +87,7 @@ add_wrapper() test -n $oowrapper_name create_man_link $oowrapper_name $used_man_page $file_list # add desktop file to the right file list -test -n $desktop_file -a -f $DESTDIR/$file_list echo /usr/share/applications/$desktop_file $DESTDIR/$file_list +test -n $desktop_file -a -f $DESTDIR/$file_list echo $PREFIXDIR/share/applications/$desktop_file $DESTDIR/$file_list } # install desktop integration from plain packages @@ -109,8 +109,8 @@ sed -i \ export ICON_PREFIX=$INSTALLDIRNAME export ICON_SOURCE_DIR=$builddir/sysui/desktop/icons export PRODUCTVERSION= -export KDEMAINDIR=/usr -export GNOMEDIR=/usr +export KDEMAINDIR=$PREFIXDIR +export GNOMEDIR=$PREFIXDIR export GNOME_MIME_THEME=hicolor /bin/bash ./create_tree.sh ) @@ -119,8 +119,8 @@ rm -rf $sysui_temp # we do not want some stuff from the plain packages rm -f $DESTDIR/$PREFIXDIR/bin/$INSTALLDIRNAME-printeradmin -rm -f $DESTDIR/usr/share/applications/libreoffice-javafilter.desktop -rm -f $DESTDIR/usr/share/applications/libreoffice-printeradmin.desktop +rm -f $DESTDIR$PREFIXDIR/share/applications/libreoffice-javafilter.desktop +rm -f $DESTDIR$PREFIXDIR/share/applications/libreoffice-printeradmin.desktop if test -d $DESTDIR/opt ; then rm -f $DESTDIR/opt/$INSTALLDIRNAME rmdir --ignore-fail-on-non-empty $DESTDIR/opt @@ -139,11 +139,11 @@ cd - # put the stuff installed by create_tree.sh into the right file lists # desktop files will be added by the corresponding add_wrapper command if test -f $DESTDIR/gid_Module_Root_Brand ; then -for dir in /usr/share/application-registry \ - /usr/share/mimelnk/application \ - /usr/share/mime/packages \ - /usr/share/mime-info \ - /usr/share/icons ; do +for dir in $PREFIXDIR/share/application-registry \ + $PREFIXDIR/share/mimelnk/application \ + $PREFIXDIR/share/mime/packages \ + $PREFIXDIR/share/mime-info \ + $PREFIXDIR/share/icons ; do find $DESTDIR$dir \( -type f -o -type l \) -printf $dir/%P\n $DESTDIR/gid_Module_Root_Brand done fi @@ -162,7 +162,7 @@ add_wrapper libreofficesoffice libreoffice libreoffice-star add_wrapper lofficesoffice libreoffice gid_Module_Root_Brand add_wrapper unopkg unopkg unopkg gid_Module_Root_Brand -# /usr/bin/ooffice symlink is necessary by java UNO components to find +# $PREFIXDIR/bin/ooffice symlink is necessary by java UNO components to find # the UNO installation using $PATH, see # http://udk.openoffice.org/common/man/spec/transparentofficecomponents.html # Note: if you want to support parallel installation of more OOo versions -- 1.7.6 pgpjDozquLPbb.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Debian gcc or LO bug
Rene Engelhard wrote: ... Since Luc_ has these same line on SID, why does it work for me and not for him ? Doesn't work for me either. (Stndard Debian package configuration). Are you sure you are on *completely* uptodate sid? ... I'm on testing not in SID and I update almost every day. Concerning Luc, I don't know if he had updated his SID. Julien. -- View this message in context: http://nabble.documentfoundation.org/Debian-gcc-or-LO-bug-tp3347043p3348413.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: [Libreoffice] Debian gcc or LO bug
Hi Rene, all, On Mon, 19 Sep 2011 13:43:12 +0200 Rene Engelhard r...@debian.org wrote: Hi, On Sun, Sep 18, 2011 at 02:23:59PM -0700, julien2412 wrote: On LO-dev IRC, i met someone with this pb /home/luc/git/core/vcl/unx/gtk/a11y/atkutil.cxx:322:60: error: call of overloaded ‘insert(com::sun::star::uno::Referencecom::sun::star::accessibility::XAccessibleEventBroadcaster)’ is ambiguous Yes. Since gcc-4.6 (4.6.1-10) unstable; urgency=medium . * Update to SVN 20110910 (r178746) from the gcc-4_6-branch. - Fix PR middle-end/50266, PR tree-optimization/49911, PR tree-optimization/49518, PR tree-optimization/49628, PR tree-optimization/49628, PR target/50310, PR target/50289, PR c++/50255, PR c++/50309, PR c++/49267, PR libffi/49594. - Revert fix for PR middle-end/49886, causing PR middle-end/50295. Update to SVN 20110910 Ha, found the upstream bug: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50442 (filed by mozilla the other monster project to be sure hit by every possible regression). Best, Bjoern -- https://launchpad.net/~bjoern-michaelsen ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] [PUSHED] unify unxfbsd.mk
On Mon, Sep 19, 2011 at 03:24:52PM +0200, Francois Tigeot wrote: On Mon, Sep 19, 2011 at 01:49:25PM +0200, Baptiste Daroussin wrote: Here is a patch to remove the unxfbsdi.mk and unxfbsx.mk, using a single unxfbsd.mk highly simplified Thanks for the patch, I've pushed it (apart from the DLLPOSTFIX= line). Thanks, --- Bapt pgp3YQRoWgdbZ.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] problem autoinput Calc in master
On Fri, 2011-09-16 at 12:06 +0200, Cor Nouws wrote: Hi, Older build (last week): ID: 11df18b-3f8994a-4525197 New spreadsheet Type Mango next row try to type Melon immediately Mango is placed Turn off experimental feature, re-start Calc and try again. Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] [PUSHED] FreeBSD share some failures with OSX
On Mon, Sep 19, 2011 at 01:59:47PM +0200, Baptiste Daroussin wrote: Here is a patch to avoid a unit test that fail the same on FreeBSD as on OSX (Apparently because of aKname don't know more about it yet) Pushed today. -- Francois Tigeot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATH] [PUSHED] fix FreeBSD specific soenv entry
On Mon, Sep 19, 2011 at 02:01:33PM +0200, Baptiste Daroussin wrote: Some FreeBSD only fixes for soenv Pushed. -- Francois Tigeot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [libreoffice.boldandbusted.com] cppcheck's unusedFunction check activated
Hi *, I made an adjustment to the run line for cppcheck, removing -j 2. Removing parallel jobs allows the unusedFunction check to run, and only lifts the run time from around 2 hours to 3. I have zero clue as to if this unused function check really works (especially against this giant codebase), so let me know how it goes. :) Cheers, Jesse P.S. If you've been running cppcheck with parallel jobs, this is what you'd see: cppcheck: unusedFunction check can't be used with -j option, so it was disabled. -- Jesse Adelman Senior Systems Shepherd ilikelinux Consulting/Bold and Busted, LLC http://ilikelinux.com/ http://boldandbusted.com/ Brisbane, CA Tel: (415) 656-4480 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] virus in git repository?
Hi. I have cloned the git repository for libreoffice to my son's Debian computer as well as my mac. The internet is flaky and after several attempts to get the source on my windows computer, I decided to copy the entire git repository folder from my sons computer. The problem is that when I tried to copy to the windows computer, avast antivirus software won't let me copy as it claims that /svtools/qa/cppunit/data/wmf/pass/CVE-2006-4070-1.wmf is a virus. After several failed attempts I turned off the antivirus software (and unplugged my 3G dongle) and copied it anyway. I am reporting it here in case it is of importance. Anyway, the git pull failed with the error message: error: Entry 'basic/source/app/basic.hrc' not uptodate. Cannot merge. Is this common? I have been trying to download xcode for the last 4 days at the office, but it is just too big. So I am hoping to be able to build this somehow, probably on the debian first. (I have all of the build dependencies taken care of.) Brian Wilson ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] virus in git repository?
On Mon, Sep 19, 2011 at 10:24 AM, Brian Wilson bount...@gmail.com wrote: Hi. I have cloned the git repository for libreoffice to my son's Debian computer as well as my mac. The internet is flaky and after several attempts to get the source on my windows computer, I decided to copy the entire git repository folder from my sons computer. The problem is that when I tried to copy to the windows computer, avast antivirus software won't let me copy as it claims that /svtools/qa/cppunit/data/wmf/pass/CVE-2006-4070-1.wmf is a virus. After several failed attempts I turned off the antivirus software (and unplugged my 3G dongle) and copied it anyway. That is most likely a false positive.. The file above is apparently a test document for a security bug so it may contained weirdly formed data that confuse the virus scanner I am reporting it here in case it is of importance. Anyway, the git pull failed with the error message: error: Entry 'basic/source/app/basic.hrc' not uptodate. Cannot merge. that is because the file basic/source/app/basic.hrc has some local un-committed change. if you did not intend to do that (i.e change that file) then git checkout -f basic/source/app/basic.hrc should put things back in order Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] do not hardcode gperf
Here is a patch to remove a hard coded gperf call. regards, Bapt From fa78e8613963ab809d3de72be69a1c85421d9c5a Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin b...@freebsd.org Date: Mon, 19 Sep 2011 19:22:32 +0200 Subject: [PATCH 6/6] Do not hard code gperf --- filter/source/svg/Makefile |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/filter/source/svg/Makefile b/filter/source/svg/Makefile index bd0e85e..20ed8f8 100644 --- a/filter/source/svg/Makefile +++ b/filter/source/svg/Makefile @@ -53,7 +53,7 @@ $(filter_GEN_svg_Tokens_hxx) : $(filter_GEN_svg_Tokens_gperf) $(filter_GEN_svg_Tokens_cxx) : $(filter_GEN_svg_Tokens_gperf) $(call gb_Output_announce,$@,build,GPF,1) $(call gb_Helper_abbreviate_dirs, \ - gperf --compare-strncmp -C -m 20 $(filter_GEN_svg_Tokens_gperf) \ + $(GPERF) --compare-strncmp -C -m 20 $(filter_GEN_svg_Tokens_gperf) \ | sed -e s/(char\*)0/(char\*)0$(COMMA) 0/g \ $(filter_GEN_svg_Tokens_cxx)) -- 1.7.6 pgpZhn0n6jtjs.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] [PUSHED] do not hardcode gperf
Hi, On Mon, Sep 19, 2011 at 07:31:56PM +0200, Baptiste Daroussin wrote: Here is a patch to remove a hard coded gperf call. Pushed. Grüße/Regards, René -- .''`. René Engelhard -- Debian GNU/Linux Developer : :' : http://www.debian.org | http://people.debian.org/~rene/ `. `' r...@debian.org | GnuPG-Key ID: D03E3E70 `- Fingerprint: E12D EA46 7506 70CF A960 801D 0AA0 4571 D03E 3E70 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PORTERS HEADS-UP] feature/kill-set_soenv
Hi, as quite a few of you already noted I created a branch called kill-set_soenv which intends to ... kill set_soenv.in. Why does that script need to die? Well, currently we are: - calling a perl-script called autogen.sh, to: - call autoconf to create ./configure from configure.in - call the just created configure, which: - uses AC_OUTPUT to generate a ./set_soenv from ./set_soenv.in - call the just created ./set_soenv (which it a Perl script): - set_soenv now creates a Env.Host.sh file, which is a script script, which again is sourced in the build by the shell started by make before calling a perl script called build.pl All of this is a sure fire way to drive a newcomer (and even oldtimers) insane. IMHO the final goal has to be that the above process gets as simple as: - calling a perl-script called autogen.sh, to: - call autoconf to create ./configure from configure.in - call the just created configure, which: - uses AC_OUTPUT to create a config.Host.mk, which has gnu make syntax and is sourced by make when building the product As there are lots and lots of obsolete variables in the Env.Host.sh file, quite a few variables are set only under specific conditions and some have different names (or different content as they are hacked/changed in later steps) in: - the configure.in script - the set_soenv.in script - the final Env.Host.sh file the first step is to kill the set_soenv file to create Env.Host.sh directly with AC_OUTPUT. Then one could simplify most of the irritating differences and and get rid of the obsolete stuff. Changing the makefile to source a config.Host.mk makefile insead of an environment then be the final step. feature/kill-set_soenv is a proof-of-concept without cleanup, just showing that set_soenv is not needed anymore. It builds the LibreOfficeLinux.conf on unxlngx6.pro and passes subsequenttest without failure. It also introduces a DevLean.conf (--disable-mozilla --disable-binfilter --without-help --without-myspell-dicts) and builds and passes that. So what I am asking is: Can porters help me get their platform buildable on that branch? I would integrate that branch on master in about 2 weeks and would love it to be tested on all major platforms by then. I ported linux for now and can test the ppc, armel, i386 and amd64 target, but elsewhere any help (porting and testing) is appreciated. Best, Bjoern -- https://launchpad.net/~bjoern-michaelsen ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PORTERS HEADS-UP] feature/kill-set_soenv
2011/9/19 Bjoern Michaelsen bjoern.michael...@canonical.com: *snip* So what I am asking is: Can porters help me get their platform buildable on that branch? I would integrate that branch on master in about 2 weeks and would love it to be tested on all major platforms by then. I ported linux for now and can test the ppc, armel, i386 and amd64 target, but elsewhere any help (porting and testing) is appreciated. *snip* If anyone is interested in testing this on his Gentoo then he can simply do this: # echo 'libreoffice_LIVE_BRANCH=kill-set_soenv' /etc/make.conf # emerge -1 =libreoffice--r1 Remember to remove the line from make.conf after you are done! ;) Cheers Tom ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PORTERS HEADS-UP] feature/kill-set_soenv
2011/9/19 Tomáš Chvátal scarab...@gentoo.org: 2011/9/19 Bjoern Michaelsen bjoern.michael...@canonical.com: *snip* So what I am asking is: Can porters help me get their platform buildable on that branch? I would integrate that branch on master in about 2 weeks and would love it to be tested on all major platforms by then. I ported linux for now and can test the ppc, armel, i386 and amd64 target, but elsewhere any help (porting and testing) is appreciated. *snip* If anyone is interested in testing this on his Gentoo then he can simply do this: # echo 'libreoffice_LIVE_BRANCH=kill-set_soenv' /etc/make.conf # emerge -1 =libreoffice--r1 Is it really going to work ? that branch exist only in the core repository but not in help, binfilter, dictionnary or translation Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH][PUSHED] use PREFIXDIR in distro-install-desktop-integration
2011/9/19 Baptiste Daroussin b...@freebsd.org: Hi, Here is a patch to use $PREFIXDIR instead of hardcoding /usr in the deistro-install-desktop-integration script. This is necessary to build on FreeBSD as libreoffice is not installed in /usr but we still want to use distro-install-desktop-integration. Of course, the patch is in the licenses that you prefers :) regards, Bapt Thanks for patch, applied. (note aside those scripts needs real rewrite to use proper autoconf variables [datadir,icondir,docdir,etc]) Cheers Tom ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] [PUSHED] use PREFIXDIR in create_tree.sh
2011/9/19 Baptiste Daroussin b...@freebsd.org: use PREFIXDIR instead of hard coding /usr in create_tree.sh --- Bapt Thanks for patch, applied. Cheers Tom ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] Update Zenity with progress icon notification
Hullo List, This patch adds a clock style progress, so one doesn't have to mouse over the Zenity icon to see where it currently stands. Very simple, very rudimentary, but already summat useful for me. Hope others find it so as well. Kevin From adb5e92ef23923089b0fed77261403fe001b59a4 Mon Sep 17 00:00:00 2001 From: Kevin Hunter hunt...@earlham.edu Date: Mon, 19 Sep 2011 14:28:43 -0400 Subject: [PATCH] Update Zenity with progress icon notification Add a clock style progress meter for the build via dynamically generated svg images. The colors are rather arbitrarily chosen, but with a very minor attempt to be readable by color-blind folks. A second round cut of this patch might make the fill and stroke colors configurable. --- solenv/bin/build.pl | 57 +++ 1 files changed, 57 insertions(+), 0 deletions(-) diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl index 865e4d1..93a6952 100755 --- a/solenv/bin/build.pl +++ b/solenv/bin/build.pl @@ -1910,10 +1910,67 @@ sub print_announce { $announce_string .= $echo . =\n; print $announce_string; +my $percent_progress = $modules_started / $total_modules; zenity_tooltip($text); +my $zenity_icon = create_progress_svg($percent_progress); +zenity_icon( $zenity_icon ) if ( $zenity_icon ); + $module_announced{$prj}++; }; +sub create_progress_svg { +# The colors are rather arbitrarily chosen, but with a very minor attempt +# to be readable by color-blind folks. A second round cut might make +# the fill and stroke colors configurable. + +# This function currently leaves a stray svg file in the tmp directory. +# This shouldn't be too much of a problem, but if the next person in line +# wants to remove this, go ahead. + +if (! zenity_enabled()) { +return undef; +} + +my $pi = 3.1415923; +my $percentage = shift; +my $path = $percentage .5 ? '1,1' : '0,1'; + +# Creating a clock progress meter that starts from the 12 position; the +# cursor starts in the center (M50,50), then goes immediately vertical +# (v-50). Associating sin with x, because it's the /difference/ of where +# the cursor needs to move. Other relevent documentation may be found at +# +# http://www.w3.org/TR/SVG11/paths.html#PathElement and +# http://www.w3.org/TR/SVG11/images/paths/arcs02.svg + +my $x = 50 * sin( $percentage * 2 * $pi ); +my $y = 50 - 50 * cos( $percentage * 2 * $pi ); + +my $progress_file = $tmp_dir/lo_build_progress.svg; +open( PROGRESS, '', $progress_file ) or return undef; +print PROGRESS EOF; +?xml version=1.0 encoding=UTF-8 standalone=no? +svg + xmlns:dc=http://purl.org/dc/elements/1.1/; + xmlns:cc=http://creativecommons.org/ns#; + xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#; + xmlns:svg=http://www.w3.org/2000/svg; + xmlns=http://www.w3.org/2000/svg; + version=1.1 + viewBox=0 0 100 100 + path + d=M50,50 v-50 a50,50 0 $path $x,$y z + fill=#aaa + stroke=#00f + stroke-width=1 / +/svg +EOF + +close( PROGRESS ); + +return $progress_file; +} + sub zenity_enabled { return 0 if ($ENV{ENABLE_ZENITY} ne TRUE); return 0 if (!defined $ENV{DISPLAY}); -- 1.7.1 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PORTERS HEADS-UP] feature/kill-set_soenv
Dne 19. září 2011 20:32 Norbert Thiebaud nthieb...@gmail.com napsal(a): 2011/9/19 Tomáš Chvátal scarab...@gentoo.org: 2011/9/19 Bjoern Michaelsen bjoern.michael...@canonical.com: *snip* So what I am asking is: Can porters help me get their platform buildable on that branch? I would integrate that branch on master in about 2 weeks and would love it to be tested on all major platforms by then. I ported linux for now and can test the ppc, armel, i386 and amd64 target, but elsewhere any help (porting and testing) is appreciated. *snip* If anyone is interested in testing this on his Gentoo then he can simply do this: # echo 'libreoffice_LIVE_BRANCH=kill-set_soenv' /etc/make.conf # emerge -1 =libreoffice--r1 Is it really going to work ? that branch exist only in the core repository but not in help, binfilter, dictionnary or translation Norbert Damn, I wrote the former code in git eclass to be non-fatal (eg just keep master if it is not there), but in git-2.eclass i stop the execution if the branch is not found. debug-print ${FUNCNAME}: git checkout -b ${branchname} ${src} git checkout -b ${branchname} ${src} \ || die ${FUNCNAME}: changing the branch failed In that case the patch I attached here should make it do the magic :) Cheers Tom PS: good catch, I completely forgot that I made that branching fatal. Index: libreoffice--r1.ebuild === RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice--r1.ebuild,v retrieving revision 1.17 diff -u -b -B -r1.17 libreoffice--r1.ebuild --- libreoffice--r1.ebuild 18 Sep 2011 09:45:10 - 1.17 +++ libreoffice--r1.ebuild 19 Sep 2011 18:43:06 - @@ -282,6 +282,7 @@ for mod in ${MODULES}; do mypv=${PV/.} [[ ${mypv} != ${PV} ]] EGIT_BRANCH=${PN}-${mypv/./-} + [[ ${mod} == core ]] EGIT_BRANCH=kill-set_soenv EGIT_PROJECT=${PN}/${mod} EGIT_SOURCEDIR=${WORKDIR}/${PN}-${mod}-${PV} EGIT_REPO_URI=git://anongit.freedesktop.org/${PN}/${mod} ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Remove NULL checks from delete
Hi, I've recently seen some changes, which removed unnecessary NULL checks for delete commands with the form: -if (pTextPContext) -delete pTextPContext; +delete pTextPContext; Codebase is full with these. I've attached a little perl script which should solve this conversion. I've attached a sample for the vcl dir. Any objections? Thomas #!/usr/bin/perl # run: # find /path/to/libo -name *.cxx | xargs perl replaceDelete.pl # process multi file targets foreach (@ARGV) { my $file = $_; my $data = ; # grep file to $data open(fh, $file); while (fh) { $data .= $_; } close(fh); # replaces unnecessary if checks for delete, example: # # -if (pTextPContext) # -delete pTextPContext; # +delete pTextPContext; # check for: if ( testString ) delete testString; while ($data =~ /if \(\s*([A-Za-z]+)\s*\)\s*\n\s*delete\s+[A-Za-z]+\s*\;/gs) { print found: $1\n; # use intendation of if statement $data =~ s/(\n\s*)if \(\s*$1\s*\)\s*\n\s+(delete\s+$1\s*\;)/$1$2/gs; } # write file open(fh, $file); print fh $data; close(fh); } diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx index 56eff66..74e0891 100644 --- a/vcl/aqua/source/window/salframe.cxx +++ b/vcl/aqua/source/window/salframe.cxx @@ -127,8 +127,7 @@ AquaSalFrame::~AquaSalFrame() if( this == s_pCaptureFrame ) s_pCaptureFrame = NULL; -if ( mpGraphics ) -delete mpGraphics; +delete mpGraphics; if( mpDockMenuEntry ) // life cycle comment: the menu has ownership of the item, so no release diff --git a/vcl/ios/source/window/salframe.cxx b/vcl/ios/source/window/salframe.cxx index f0745ed..73d3e5b 100644 --- a/vcl/ios/source/window/salframe.cxx +++ b/vcl/ios/source/window/salframe.cxx @@ -106,8 +106,7 @@ IosSalFrame::~IosSalFrame() if( this == s_pCaptureFrame ) s_pCaptureFrame = NULL; -if ( mpGraphics ) -delete mpGraphics; +delete mpGraphics; if ( mpView ) { [mpView release]; diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx index 6e76706..468e7c8 100755 --- a/vcl/source/app/dbggui.cxx +++ b/vcl/source/app/dbggui.cxx @@ -1998,8 +1998,7 @@ void DbgGUIDeInit() DbgSetAbort( NULL ); DbgWindow* pDbgWindow = ImplGetSVData()-maWinData.mpDbgWin; -if ( pDbgWindow ) -delete pDbgWindow; +delete pDbgWindow; } // --- diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index eec8ba5..ff57877 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -1556,10 +1556,8 @@ ImplAllSettingsData::ImplAllSettingsData( const ImplAllSettingsData rData ) : ImplAllSettingsData::~ImplAllSettingsData() { -if ( mpLocaleDataWrapper ) -delete mpLocaleDataWrapper; -if ( mpUILocaleDataWrapper ) -delete mpUILocaleDataWrapper; +delete mpLocaleDataWrapper; +delete mpUILocaleDataWrapper; if ( mpI18nHelper ) delete mpI18nHelper; if ( mpUII18nHelper ) diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index e36cdaf..2cd5f47 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -253,8 +253,7 @@ Edit::~Edit() delete mpIMEInfos; -if ( mpUpdateDataTimer ) -delete mpUpdateDataTimer; +delete mpUpdateDataTimer; if ( mxDnDListener.is() ) { diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx index 13513f6..2e1ad53 100644 --- a/vcl/source/control/menubtn.cxx +++ b/vcl/source/control/menubtn.cxx @@ -133,10 +133,8 @@ void MenuButton::ImplLoadRes( const ResId rResId ) MenuButton::~MenuButton() { -if ( mpMenuTimer ) -delete mpMenuTimer; -if ( mpOwnMenu ) -delete mpOwnMenu; +delete mpMenuTimer; +delete mpOwnMenu; } // --- diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index 440da9c..6a47815 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -722,8 +722,7 @@ Printer::~Printer() ImplReleaseGraphics(); if ( mpInfoPrinter ) ImplGetSVData()-mpDefInst-DestroyInfoPrinter( mpInfoPrinter ); -if ( mpDisplayDev ) -delete mpDisplayDev; +delete mpDisplayDev; else { // OutputDevice-Dtor versucht das gleiche, deshalb muss hier diff --git a/vcl/source/gdi/regband.cxx b/vcl/source/gdi/regband.cxx index 1cec295..b091783 100644 --- a/vcl/source/gdi/regband.cxx +++ b/vcl/source/gdi/regband.cxx @@ -201,8 +201,7 @@ void ImplRegionBand::ProcessPoints() } // remove last element if necessary -if ( pRegionBandPoint ) -delete pRegionBandPoint; +delete pRegionBandPoint; // list is now empty mpFirstBandPoint = NULL; diff --git a/vcl/source/window/accmgr.cxx b/vcl/source/window/accmgr.cxx index 43c78d5..a14530a 100644 ---
Re: [Libreoffice] problem autoinput Calc in master
Kohei Yoshida wrote (19-09-11 15:45) Turn off experimental feature, re-start Calc and try again. Indeed. Thanks, Work related to new row height? Cor -- - Cor - http://nl.libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Proposal: slowcheck -- a new gbuild toplevel target
Hi all, we now have a good systematic set of test targets with unitcheck, subsequentcheck and check on master(*). However, we now have so many unittests (which is good) that running each and everyone on every build slows down the development cycle esp. in sc -- just because they taking unittesting serious. Now we: a) dont want developers to be punished for writing unittests with slow turnarounds (they might stop writing them) b) dont want people to disable all in-build unittests to be run on every compile (because it is far too easy to forget to run them again once before pushing then) so I am proposing introducing a new target in the build system called slowunitcheck. Those are tests that are technically unittests (need no full install), but considered to slow/longrunning to be run on every build. Instead those are run along the subsequenttests when running make check (or alone by running make slowunitcheck). Opinions? Best, Bjoern (*) see http://wiki.documentfoundation.org/Development/buildsystemtargets for details -- https://launchpad.net/~bjoern-michaelsen ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] problem autoinput Calc in master
On Mon, Sep 19, 2011 at 3:18 PM, Cor Nouws oo...@nouenoff.nl wrote: Kohei Yoshida wrote (19-09-11 15:45) Turn off experimental feature, re-start Calc and try again. Indeed. Thanks, Work related to new row height? No. It's most likely due to Anurag's GSOC work to support multiline formula input bar, which gets turned on when the experimental feature is on. That turns out to have some effect on the focus handling on in-line cell input (as you and I just found out). Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Remove NULL checks from delete
On 09/19/2011 08:58 PM, Thomas Arnhold wrote: I've recently seen some changes, which removed unnecessary NULL checks for delete commands with the form: - if (pTextPContext) - delete pTextPContext; + delete pTextPContext; Codebase is full with these. I've attached a little perl script which should solve this conversion. I've attached a sample for the vcl dir. Any objections? By the way, using the below regexps (best run in a C locale) should find even more instances, and should avoid false positives of the form if (foo) delete bar; or (unlikely) #if (foo) \n delete foo;: foreach (@ARGV) { my $file = $_; open(FH, $file); my $data = ; while (FH) { $data .= $_; } close(FH); while ($data =~ /((?!#)\s*\bif\s*\(\s*(\w+)\s*\)\s*delete\s+\2\s*;)/g) { print found $1\n; } while ($data =~ /((?!#)\s*\bif\s*\(\s*(\w+)\s*\)\s*{\s*delete\s+\2\s*;\s*})/g) { print found $1\n; } } (The outer parentheses are only there for print found $1\n to work -- no idea how Perl makes available the complete match without that hack... The leading (?!#)\s* should really read (?!#\s*), but then Perl complains that Variable length lookbehind [is] not implemented.) -Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Libreoffice-commits] .: Branch 'libreoffice-3-4' - solenv/gbuild
Björn, What good is that backport to 3.4? For one, the fix turns out to not work yet (as executables already built using gbuild but only used during the build itself use a NONEBIN token in solenv/gbuild/platform/*.mk instead of the NONE token used in solenv/inc/*.mk, so that macosx-change-install-names.pl complains and fails). For another, are there any executables in 3.4 that are built using gbuild but are not only used during the build itself (i.e., for which the missing call to macosx-change-install-names.pl actually matters)? -Stephan On 09/19/2011 11:06 PM, Bjoern Michaelsen wrote: solenv/gbuild/platform/macosx.mk |2 ++ 1 file changed, 2 insertions(+) New commits: commit a87a8ee5a1919f6f6b4b35668456c03bdd499c85 Author: Stephan Bergmannsberg...@redhat.com Date: Mon Sep 19 21:39:46 2011 +0200 Call macosx-change-install-names on executables in gbuild, too. Signed-off-by: Bjoern Michaelsenbjoern.michael...@canonical.com diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 2def0c9..ff7 100755 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -274,6 +274,8 @@ $(call gb_Helper_abbreviate_dirs,\ $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \ -o $(1) \ `cat $${DYLIB_FILE}` \ + $(if $(filter Executable,$(TARGETTYPE)),\ + $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Executable $(LAYER) $(1)) \ $(if $(filter Library CppunitTest,$(TARGETTYPE)),\ $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Library $(LAYER) $(1) \ ln -sf $(1) $(patsubst %.dylib,%.jnilib,$(1))) \ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Windows builds with Visual Studio Express
Am 19.09.2011 12:10, schrieb Jesús Corrius: agree that at least for the first part reimplementing would be a good idea, and in fact I once had planned to do that. Admittedly it was never important enough. Not like it is a top priority now, but if you have some spare time, a patch would not be refused :) Another interesting question is if some of those bits are actually used by someone. I am sure we want the OLE drag and drop support, but would it be *THAT* bad if we remove the ActiveX control, for example? ;) IIRC it's not used for the DD code, but for the OLE linking/embedding code. I also can confirm Fridrich's statement: there *are* people that use the Active-X control. Regards, Mathias ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] SvUShorts - std::vector
Hi, I replaced some usages of SvUShorts with std::vectors. License is LGPLv3+/MPL Cheers, Daniel From b15d4e4363f567c4c0a42c9fb830745b2625ca44 Mon Sep 17 00:00:00 2001 From: Daniel Di Marco d.dima...@gmx.de Date: Mon, 19 Sep 2011 23:18:28 + Subject: [PATCH] replaced some SvUShorts with std::vector --- sw/source/core/crsr/findtxt.cxx |9 ++- sw/source/core/crsr/viscrs.cxx | 11 ++--- sw/source/core/doc/tblrwcl.cxx |6 ++-- sw/source/core/docnode/ndtbl.cxx | 43 ++--- sw/source/core/inc/tblrwcl.hxx | 10 ++-- sw/source/core/txtnode/ndtxt.cxx | 15 +++-- sw/source/ui/app/docstyle.cxx| 20 - 7 files changed, 50 insertions(+), 64 deletions(-) diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx index 3add534..9a86bac 100644 --- a/sw/source/core/crsr/findtxt.cxx +++ b/sw/source/core/crsr/findtxt.cxx @@ -32,9 +32,6 @@ #include com/sun/star/util/SearchOptions.hpp #include com/sun/star/util/SearchFlags.hpp -#define _SVSTDARR_USHORTS -#include svl/svstdarr.hxx - #include vcl/svapp.hxx #include vcl/window.hxx @@ -76,7 +73,7 @@ String lcl_CleanStr( const SwTxtNode rNd, xub_StrLen nStart, bool bNewHint = true; bool bNewSoftHyphen = true; const xub_StrLen nEnd = rEnde; -SvUShorts aReplaced; +std::vectorsal_uInt16 aReplaced; do { @@ -155,7 +152,7 @@ String lcl_CleanStr( const SwTxtNode rNd, xub_StrLen nStart, else { if ( bEmpty ) -aReplaced.Insert( nAkt, aReplaced.Count() ); +aReplaced.push_back( nAkt ); rRet.SetChar( nAkt, '\x7f' ); } } @@ -178,7 +175,7 @@ String lcl_CleanStr( const SwTxtNode rNd, xub_StrLen nStart, } while ( true ); -for( sal_uInt16 i = aReplaced.Count(); i; ) +for( sal_uInt16 i = aReplaced.size(); i; ) { const xub_StrLen nTmp = aReplaced[ --i ]; if( nTmp == rRet.Len() - 1 ) diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx index 3ec97b2..9ec4b0a 100644 --- a/sw/source/core/crsr/viscrs.cxx +++ b/sw/source/core/crsr/viscrs.cxx @@ -30,11 +30,6 @@ #include precompiled_sw.hxx -#ifndef _SVSTDARR_HXX -#define _SVSTDARR_USHORTS -#include svl/svstdarr.hxx -#endif - #include vcl/dialog.hxx #include vcl/msgbox.hxx #include vcl/wrkwin.hxx @@ -560,21 +555,21 @@ short SwShellCrsr::MaxReplaceArived() { // Terminate old actions. The table-frames get constructed and // a SSelection can be created. -SvUShorts aArr; +std::vectorsal_uInt16 aArr; sal_uInt16 nActCnt; ViewShell *pShell = const_cast SwCrsrShell* ( GetShell() ), *pSh = pShell; do { for( nActCnt = 0; pSh-ActionPend(); ++nActCnt ) pSh-EndAction(); -aArr.Insert( nActCnt, aArr.Count() ); +aArr.push_back( nActCnt ); } while( pShell != ( pSh = (ViewShell*)pSh-GetNext() ) ); { nRet = QueryBox( pDlg, SW_RES( MSG_COMCORE_ASKSEARCH )).Execute(); } -for( sal_uInt16 n = 0; n aArr.Count(); ++n ) +for( sal_uInt16 n = 0; n aArr.size(); ++n ) { for( nActCnt = aArr[n]; nActCnt--; ) pSh-StartAction(); diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx index 82fa926..49c5ddf 100644 --- a/sw/source/core/doc/tblrwcl.cxx +++ b/sw/source/core/doc/tblrwcl.cxx @@ -111,7 +111,7 @@ struct CR_SetBoxWidth { SwSelBoxes aBoxes; SwSortTableLines aLines; -SvUShorts aLinesWidth; +std::vectorsal_uInt16 aLinesWidth; SwShareBoxFmts aShareFmts; SwTableNode* pTblNd; SwUndoTblNdsChg* pUndo; @@ -143,7 +143,7 @@ struct CR_SetBoxWidth bSplittBox( rCpy.bSplittBox ), bAnyBoxFnd( rCpy.bAnyBoxFnd ) { aLines.Insert( rCpy.aLines ); -aLinesWidth.Insert( rCpy.aLinesWidth, 0 ); +aLinesWidth = rCpy.aLinesWidth; } SwUndoTblNdsChg* CreateUndo( SwUndoId eUndoType ) @@ -161,7 +161,7 @@ struct CR_SetBoxWidth SwTableLinePtr p = (SwTableLine*)rBox.GetUpper(); sal_uInt16 nFndPos; if( aLines.Insert( p, nFndPos )) -aLinesWidth.Insert( nWidth, nFndPos ); +aLinesWidth.insert( aLinesWidth.begin()+nFndPos, nWidth ); else aLinesWidth[ nFndPos ] = aLinesWidth[ nFndPos ] + nWidth; } diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index ad98a53..eceaaa9 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -898,7 +898,7 @@ SwTableNode* SwNodes::TextToTable( const SwNodeRange rRange, sal_Unicode cCh, new SwEndNode( rRange.aEnd, *pTblNd ); SwDoc* pDoc =
Re: [Libreoffice] [Libreoffice-commits] .: Branch 'libreoffice-3-4' - solenv/gbuild
On Mon, 19 Sep 2011 23:20:32 +0200 Stephan Bergmann sberg...@redhat.com wrote: What good is that backport to 3.4? Well, it is a clearcut regression (the error was introduced between 3.3 and 3.4) and a good fix (even breaking on link is better than breaking at runtime) -- so I automatically backported after review. Other than the needs one signoff-rule, we have little guidelines on what goes on the release branch. Maybe we should be a little more strict. But I guess still no revert needed? Best, Bjoern -- https://launchpad.net/~bjoern-michaelsen ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Proposal: slowcheck -- a new gbuild toplevel target
Hello Bjoern, Opinions? I personally like that idea very much but have one little suggestion. We should run the tinderboxs with this make target if they don't already use the check target. That would ensure that even when someone did not run the unit tests before pushing he gets a little notice.http://lists.freedesktop.org/mailman/listinfo/libreoffice Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Libreoffice-commits] .: Branch 'libreoffice-3-4' - solenv/gbuild
On Mon, Sep 19, 2011 at 5:34 PM, Bjoern Michaelsen bjoern.michael...@canonical.com wrote: On Mon, 19 Sep 2011 23:20:32 +0200 Stephan Bergmann sberg...@redhat.com wrote: What good is that backport to 3.4? Well, it is a clearcut regression (the error was introduced between 3.3 and 3.4) and a good fix (even breaking on link is better than breaking at runtime) -- so I automatically backported after review. Other than the needs one signoff-rule, we have little guidelines on what goes on the release branch. Maybe we should be a little more strict. But I guess still no revert needed? well... not so fast... the patch does not fix everything, just make it blow earlier... first in i18npool where gencoll_rule is not happy because it does not have a LAYER defined for it then illegal combination app/NONEBIN/OOO at /Volumes/Raid0/core/solenv/bin/macosx-change-install-names.pl line 56, IN line 2. make[1]: *** [/Volumes/Raid0/core/workdir/unxmacxi.pro/LinkTarget/Executable/mkunroll] Error 9 make[1]: *** Waiting for unfinished jobs illegal combination app/NONEBIN/URELIB at /Volumes/Raid0/core/solenv/bin/macosx-change-install-names.pl line 56, IN line 2. make[1]: *** [/Volumes/Raid0/core/workdir/unxmacxi.pro/LinkTarget/Executable/so_checksum] Error 9 illegal combination app/NONEBIN/OOO at /Volumes/Raid0/core/solenv/bin/macosx-change-install-names.pl line 56, IN line 2. make[1]: *** [/Volumes/Raid0/core/workdir/unxmacxi.pro/LinkTarget/Executable/rscdep] Error 9 dmake: Error code 2, while making 'all' so 3.4 may have accidentally worked because nothing that produce delivered Executable was gbuildified... but at least it was 'working'... with that patch alone I'm afraid 3.4 may not build anymore on MacOSX... Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Proposal: slowcheck -- a new gbuild toplevel target
On Mon, Sep 19, 2011 at 5:59 PM, Markus Mohrhard markus.mohrh...@googlemail.com wrote: Hello Bjoern, Opinions? I personally like that idea very much but have one little suggestion. We should run the tinderboxs with this make target if they don't already use the check target. That would ensure that even when someone did not run the unit tests before pushing he gets a little notice. There is a difference between allowing for a fast make _while_ coding, and another to push stuff without bothering to run the unit-tests... Tinderbox are the second line of defense... the first line of defense is for each dev to make sure that his changes -- at least -- don't break his own build. iow shit happens, but that's no reason to encourage it... Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Debian gcc or LO bug
Hi, On Mon, Sep 19, 2011 at 02:23:38PM +0200, Bjoern Michaelsen wrote: On Sun, Sep 18, 2011 at 02:23:59PM -0700, julien2412 wrote: On LO-dev IRC, i met someone with this pb /home/luc/git/core/vcl/unx/gtk/a11y/atkutil.cxx:322:60: error: call of overloaded ‘insert(com::sun::star::uno::Referencecom::sun::star::accessibility::XAccessibleEventBroadcaster)’ is ambiguous Yes. Since gcc-4.6 (4.6.1-10) unstable; urgency=medium . * Update to SVN 20110910 (r178746) from the gcc-4_6-branch. - Fix PR middle-end/50266, PR tree-optimization/49911, PR tree-optimization/49518, PR tree-optimization/49628, PR tree-optimization/49628, PR target/50310, PR target/50289, PR c++/50255, PR c++/50309, PR c++/49267, PR libffi/49594. - Revert fix for PR middle-end/49886, causing PR middle-end/50295. Update to SVN 20110910 Ha, found the upstream bug: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50442 (filed by mozilla the other monster project to be sure hit by every possible regression). Indeed, tried a gcc with the patch applied. Fixes my compile. Filed a bug with patch: http://bugs.debian.org/642176 Grüße/Regards, René -- .''`. René Engelhard -- Debian GNU/Linux Developer : :' : http://www.debian.org | http://people.debian.org/~rene/ `. `' r...@debian.org | GnuPG-Key ID: D03E3E70 `- Fingerprint: E12D EA46 7506 70CF A960 801D 0AA0 4571 D03E 3E70 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Libreoffice-commits] .: Branch 'libreoffice-3-4' - solenv/gbuild
actually I get further using http://cgit.freedesktop.org/libreoffice/core/commit/?id=ff1c626fa1380c7af5a135f80b45de7e62025eed which should probably be ported back to 3.4 too if you keep the previous patch in. Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-bugs] [Bug 40881] Drawing saved in flat xml reopens libreoffice as maths editor
https://bugs.freedesktop.org/show_bug.cgi?id=40881 --- Comment #29 from David Nelson comme...@traduction.biz 2011-09-19 04:37:50 PDT --- @Rainer: OK, I have taken note of this. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 37860] Formula returns #VALUE in 3.4RC2 but works as expected in 3.3
https://bugs.freedesktop.org/show_bug.cgi?id=37860 --- Comment #16 from Kohei Yoshida kohei.yosh...@gmail.com 2011-09-19 06:28:21 PDT --- (In reply to comment #15) but the plain fact is that you can no longer import Excel or OO spreadsheets that use such functions. BTW Excel behaves this way. OOo didn't. So it's not so plain fact, is it. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 37860] Formula returns #VALUE in 3.4RC2 but works as expected in 3.3
https://bugs.freedesktop.org/show_bug.cgi?id=37860 Kohei Yoshida kohei.yosh...@gmail.com changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||NOTABUG -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 37860] Formula returns #VALUE in 3.4RC2 but works as expected in 3.3
https://bugs.freedesktop.org/show_bug.cgi?id=37860 Kohei Yoshida kohei.yosh...@gmail.com changed: What|Removed |Added Status Whiteboard|EasyHack|EasyHack ||DifficultyInteresting ||SkillCpp -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 40881] Drawing saved in flat xml reopens libreoffice as maths editor
https://bugs.freedesktop.org/show_bug.cgi?id=40881 --- Comment #31 from inp...@gmail.com 2011-09-19 07:28:57 PDT --- Created an attachment (id=51334) -- (https://bugs.freedesktop.org/attachment.cgi?id=51334) picture of maths editor -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 41007] New: Can't insert multiple images at once FILEOPEN
https://bugs.freedesktop.org/show_bug.cgi?id=41007 Summary: Can't insert multiple images at once FILEOPEN Product: LibreOffice Version: LibO 3.4.3 release Platform: x86 (IA32) OS/Version: Linux (All) Status: NEW Severity: enhancement Priority: medium Component: Writer AssignedTo: libreoffice-bugs@lists.freedesktop.org ReportedBy: vladimiro...@gmail.com In Writer you can't import several images at once with the file selection dialog. You must to add the images one by one, which is clearly an annoy for the usability of the program. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 41013] New: Incorrect pagination when document initially loaded
https://bugs.freedesktop.org/show_bug.cgi?id=41013 Summary: Incorrect pagination when document initially loaded Product: LibreOffice Version: LibO Master Platform: Other OS/Version: All Status: NEW Severity: normal Priority: medium Component: Writer AssignedTo: libreoffice-bugs@lists.freedesktop.org ReportedBy: hunt...@earlham.edu Created an attachment (id=51359) -- (https://bugs.freedesktop.org/attachment.cgi?id=51359) Word produced docx creates pagination issues in LO. I'm not entirely sure how to describe this bug, but I think these symptoms are all related to pagination. I'm also not sure if it's even a bug as opposed to an issue of pagination between office suites. I thought reporting was the better part of valor. This example document initially loads with LO displaying 11 pages in the status bar, while it should display 18. Note that it is a DocX format and was produced with Word 2007. (I don't know if the file is correct or not, but OpenOffice 3.2 opens it at 11 pages as well, but almost instantly updates to 18 pages.) - When I individually scroll through the pages via the PgDn key on my keyboard, LO updates its count to 16, then 18 pages (the last being correct.) - If I reload the document, the apparent internal notion resets to 11 pages (as noted via the status bar). - If I hit Ctrl+End to go the end of the document, LO reduces its internal notion of the document to 10 pages, then slowly updates to 18, while also jumping to the actual page 10, instead of leaving me at the final page. - If I print while the status bar indicates that there are only 11 pages, then only the first 11 pages of the document are printed out (to paper). (I noted this behavior with an earlier git checkout. If I'm quick enough, I can repeat these results currently. Otherwise, the pagination update after 20+ seconds seems to correct the issue.) - Anything that forces an actual pagination corrects the page count: export as pdf, print preview. - If I wait long enough (20+ seconds), LO updates the pagination. Will include pertinent git information in first comment. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 41013] Incorrect pagination when document initially loaded
https://bugs.freedesktop.org/show_bug.cgi?id=41013 --- Comment #1 from Kevin Hunter hunt...@earlham.edu 2011-09-19 10:03:27 PDT --- This symptom is against the master branch of the core-git repository: - $ git branch; echo =; git log -1 * master = commit 2c17f1196394a7fd56fe0d807146c110c5ae741a Author: Caolán McNamara caol...@redhat.com Date: Mon Sep 19 11:23:03 2011 +0100 despite its name, it appears not to be a gui app $ hash -r ; \ gcc --version | head -1 ; \ g++ --version | head -1 gcc (GCC) 4.6.1 g++ (GCC) 4.6.1 $ uname -a Linux hani 2.6.35-30-generic #59-Ubuntu SMP Tue Aug 30 19:00:03 UTC 2011 x86_64 GNU/Linux - -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs