connectivity/source/drivers/mozab/mozillasrc/makefile.mk | 14 +- cppu/inc/typelib/typedescription.h | 2 cppuhelper/inc/cppuhelper/factory.hxx | 12 +- scp2/source/ooo/file_library_ooo.scp | 5 solenv/bin/build.pl | 76 +++++++-------- sw/source/ui/dialog/wordcountwrapper.cxx | 2 6 files changed, 55 insertions(+), 56 deletions(-)
New commits: commit d1421ed9862eaf8e509364ce0a0a1f3af052f7c9 Author: Korrawit Pruegsanusak <detective.conan.1...@gmail.com> Date: Thu Feb 23 22:55:13 2012 +0700 typo diff --git a/sw/source/ui/dialog/wordcountwrapper.cxx b/sw/source/ui/dialog/wordcountwrapper.cxx index 63f262d..93bd1df 100644 --- a/sw/source/ui/dialog/wordcountwrapper.cxx +++ b/sw/source/ui/dialog/wordcountwrapper.cxx @@ -42,7 +42,7 @@ SwWordCountWrapper::SwWordCountWrapper( Window *pParentWindow, SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); pAbstDlg = pFact->CreateSwWordCountDialog( DLG_WORDCOUNT, pBindings, this, pParentWindow, pInfo ); - OSL_ENSURE(pAbstDlg, "Dialog contruction failed!"); + OSL_ENSURE(pAbstDlg, "Dialog construction failed!"); pWindow = pAbstDlg->GetWindow(); eChildAlignment = SFX_ALIGN_NOALIGNMENT; commit e10aed115b5c861e0e639d374c54b3d0b760502e Author: Korrawit Pruegsanusak <detective.conan.1...@gmail.com> Date: Thu Feb 23 22:48:44 2012 +0700 glib and gettext are only needed when ENABLE_LIBRSVG Although 'gettext' is a 'cross_toolset' dependency, it seems irrelevant. See http://lists.freedesktop.org/archives/libreoffice/2012-February/025771.html diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index b301221..0ab4566 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1622,6 +1622,7 @@ STD_LIB_FILE( gid_File_Lib_For, for) STD_LIB_FILE( gid_File_Lib_Forui, forui) // RSVG and dependencies +#if ENABLE_LIBRSVG #if ! defined (SYSTEM_GETTEXT) File gid_File_Lib_Intl LIB_FILE_BODY; @@ -1688,8 +1689,6 @@ File gid_File_Lib_Gmodule End #endif -#if ENABLE_LIBRSVG - #if ! defined SYSTEM_GDKPIXBUF File gid_File_Lib_Gdkpixbuf LIB_FILE_BODY; @@ -1773,7 +1772,7 @@ File gid_File_Lib_Librsvg End #endif -#endif +#endif // #if ENABLE_LIBRSVG #if defined(WNT) && defined(HAVE_WINDOWS_SDK) commit 98a11f3ad998a17e68a5cf5769cd39eead389f86 Author: Korrawit Pruegsanusak <detective.conan.1...@gmail.com> Date: Thu Feb 23 22:47:59 2012 +0700 Some doxygen warnings cleanup diff --git a/cppu/inc/typelib/typedescription.h b/cppu/inc/typelib/typedescription.h index 783e3ec..c4d957a 100644 --- a/cppu/inc/typelib/typedescription.h +++ b/cppu/inc/typelib/typedescription.h @@ -424,7 +424,7 @@ typedef struct _typelib_InterfaceAttributeTypeDescription <code>nAllMembers</code>, <code>ppAllMembers</code> are also initialized; <code>aBase.bComplete</code> is still false. This happens when an interface type description is created with - <code>typelib_typedescription_newMIInterface</cocde> or + <code>typelib_typedescription_newMIInterface</code> or <code>typelib_typedescription_newInterface</code>.</li> <li>At the final level, <code>pMapMemberIndexToFunctionIndex</code>, diff --git a/cppuhelper/inc/cppuhelper/factory.hxx b/cppuhelper/inc/cppuhelper/factory.hxx index c100eab..e97a2f8 100644 --- a/cppuhelper/inc/cppuhelper/factory.hxx +++ b/cppuhelper/inc/cppuhelper/factory.hxx @@ -182,9 +182,9 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >(SA @param rServiceManager the service manager used by the implementation. @param rImplementationName the implementation name. An empty string is possible. - @param ComponentInstantiation the function pointer to create an object. - @param rServiceNames the service supported by the implementation. - @param pModCount for future extension (library unloading concept). + @param pCreateFunction the function pointer to create an object. + @param rServiceNames the service supported by the implementation. + @param pModCount for future extension (library unloading concept). @return a factory that support the interfaces XServiceProvider, XServiceInfo XSingleServiceFactory and XComponent. @@ -224,9 +224,9 @@ createFactoryProxy( @param rServiceManager the service manager used by the implementation. @param rImplementationName the implementation name. An empty string is possible. - @param ComponentInstantiation the function pointer to create an object. - @param rServiceNames the service supported by the implementation. - @param pModCount for future extension (library unloading concept). + @param pCreateFunction the function pointer to create an object. + @param rServiceNames the service supported by the implementation. + @param pModCount for future extension (library unloading concept). @return a factory that support the interfaces XServiceProvider, XServiceInfo XSingleServiceFactory and XComponent. commit 7506e70e353d2d532b139c9856df55e12fa2dd39 Author: Korrawit Pruegsanusak <detective.conan.1...@gmail.com> Date: Thu Feb 23 22:34:38 2012 +0700 Tabs to spaces, no code changed diff --git a/connectivity/source/drivers/mozab/mozillasrc/makefile.mk b/connectivity/source/drivers/mozab/mozillasrc/makefile.mk index 60992c8..0b4884f 100755 --- a/connectivity/source/drivers/mozab/mozillasrc/makefile.mk +++ b/connectivity/source/drivers/mozab/mozillasrc/makefile.mk @@ -45,8 +45,8 @@ VISIBILITY_HIDDEN=TRUE .IF ("$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" dummy: - @echo " Not building the mozillasrc stuff in LibreOffice build" - @echo " dependency to Mozilla developer snapshots not feasable at the moment" + @echo " Not building the mozillasrc stuff in LibreOffice build" + @echo " dependency to Mozilla developer snapshots not feasable at the moment" @echo " see http://bugzilla.mozilla.org/show_bug.cgi?id=135137" .ELSE @@ -59,12 +59,12 @@ INCPRE += -I../bootstrap # --- Files ------------------------------------- SLOFILES = \ - $(SLO)$/MQueryHelper.obj \ - $(SLO)$/MDatabaseMetaDataHelper.obj \ - $(SLO)$/MQuery.obj \ + $(SLO)$/MQueryHelper.obj \ + $(SLO)$/MDatabaseMetaDataHelper.obj \ + $(SLO)$/MQuery.obj \ $(SLO)$/MTypeConverter.obj \ - $(SLO)$/MNameMapper.obj \ - $(SLO)$/MNSMozabProxy.obj \ + $(SLO)$/MNameMapper.obj \ + $(SLO)$/MNSMozabProxy.obj \ $(SLO)$/MNSTerminateListener.obj \ $(SLO)$/MLdapAttributeMap.obj \ diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl index e85f3e6..31e0f73 100755 --- a/solenv/bin/build.pl +++ b/solenv/bin/build.pl @@ -78,14 +78,14 @@ # This is to undo the EVIL in solenv/gbuild/BuildDirs.mk if ($ENV{OS_FOR_BUILD} eq 'WNT') { - $ENV{WORKDIR} = `cygpath -m '$ENV{WORKDIR}'`; - $ENV{OUTDIR} = `cygpath -m '$ENV{OUTDIR}'`; - $ENV{OUTDIR_FOR_BUILD} = `cygpath -m '$ENV{OUTDIR_FOR_BUILD}'`; - $ENV{SRCDIR} = `cygpath -m '$ENV{SRCDIR}'`; - chomp($ENV{WORKDIR}); - chomp($ENV{OUTDIR}); - chomp($ENV{OUTDIR_FOR_BUILD}); - chomp($ENV{SRCDIR}); + $ENV{WORKDIR} = `cygpath -m '$ENV{WORKDIR}'`; + $ENV{OUTDIR} = `cygpath -m '$ENV{OUTDIR}'`; + $ENV{OUTDIR_FOR_BUILD} = `cygpath -m '$ENV{OUTDIR_FOR_BUILD}'`; + $ENV{SRCDIR} = `cygpath -m '$ENV{SRCDIR}'`; + chomp($ENV{WORKDIR}); + chomp($ENV{OUTDIR}); + chomp($ENV{OUTDIR_FOR_BUILD}); + chomp($ENV{SRCDIR}); } my $modules_number++; @@ -116,7 +116,7 @@ my %alive_dependencies = (); my %global_deps_hash = (); # hash of dependencies of the all modules my %global_deps_hash_backup = (); # backup hash of external dependencies of the all modules - my %module_deps_hash_backup = (); # backup hash of internal dependencies for aech module + my %module_deps_hash_backup = (); # backup hash of internal dependencies for each module my @broken_modules_names = (); # array of modules, which cannot be built further my @dmake_args = (); my %dead_parents = (); @@ -479,13 +479,13 @@ sub get_build_list_path { my $possible_dir_path = $module_paths{$module}.'/prj/'; if (-d $possible_dir_path) { - my $possible_build_list_path = correct_path($possible_dir_path . "build.lst"); - if (-f $possible_build_list_path) - { - $build_list_paths{$module} = $possible_build_list_path; - return $possible_build_list_path; - }; - print_error("There's no build.lst for $module"); + my $possible_build_list_path = correct_path($possible_dir_path . "build.lst"); + if (-f $possible_build_list_path) + { + $build_list_paths{$module} = $possible_build_list_path; + return $possible_build_list_path; + }; + print_error("There's no build.lst for $module"); }; $dead_parents{$module}++; return $build_list_paths{$module}; @@ -748,10 +748,10 @@ sub store_build_list_content { if (open (BUILD_LST, $build_list_path)) { - my @build_lst = <BUILD_LST>; - $build_lists_hash{$module} = \@build_lst; - close BUILD_LST; - return; + my @build_lst = <BUILD_LST>; + $build_lists_hash{$module} = \@build_lst; + close BUILD_LST; + return; }; $dead_parents{$module}++; } @@ -1148,16 +1148,16 @@ sub check_deps_hash { $log_name = $module if ($log_name =~ /^\.+$/); $log_name .= '.txt'; - if ( $source_config->is_gbuild($module) ) - { - $log_path = correct_path("$workdir/Logs/${module}_${log_name}"); - $long_log_path = correct_path("$workdir/Logs/${module}_${log_name}"); - } - else - { - $log_path = '../' . $source_config->get_module_repository($module) . "/$module/$ENV{INPATH}/misc/logs/$log_name", - $long_log_path = correct_path($module_paths{$module} . "/$ENV{INPATH}/misc/logs/$log_name"), - } + if ( $source_config->is_gbuild($module) ) + { + $log_path = correct_path("$workdir/Logs/${module}_${log_name}"); + $long_log_path = correct_path("$workdir/Logs/${module}_${log_name}"); + } + else + { + $log_path = '../' . $source_config->get_module_repository($module) . "/$module/$ENV{INPATH}/misc/logs/$log_name", + $long_log_path = correct_path($module_paths{$module} . "/$ENV{INPATH}/misc/logs/$log_name"), + } push(@possible_order, $key); $jobs_hash{$key} = { SHORT_NAME => $string, @@ -1165,7 +1165,7 @@ sub check_deps_hash { STATUS => 'waiting', LOG_PATH => $log_path, LONG_LOG_PATH => $long_log_path, - MODULE => $module, + MODULE => $module, START_TIME => 0, FINISH_TIME => 0, CLIENT => '-' @@ -1825,14 +1825,14 @@ sub run_job { if ( $source_config->is_gbuild($jobs_hash{$registered_name}->{MODULE}) ) { - mkpath("$workdir/Logs"); + mkpath("$workdir/Logs"); } else { - if (!-d $log_dir) - { - system("$perl $mkout"); - }; + if (!-d $log_dir) + { + system("$perl $mkout"); + }; } RETRY: open (MAKE, "$job_to_do 2>&1 |") or return 8; @@ -1845,9 +1845,9 @@ RETRY: { if ($ENV{GUI} eq 'WIN' && $retry_counter > 0) { - $retry_counter -= 1; + $retry_counter -= 1; system('grep "Error 126\$"') && goto RETRY; - } + } system("echo \"log for $path\" >> $build_error_log"); system("cat $log_file >> $build_error_log"); } _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits