Author: alg
Date: Thu Jan 17 11:06:13 2013
New Revision: 1434615

URL: http://svn.apache.org/viewvc?rev=1434615&view=rev
Log:
Keeping branch in sync with trunk

Added:
    
openoffice/branches/alg/clibboard/main/offapi/com/sun/star/system/MailClientFlags.idl
      - copied unchanged from r1431511, 
openoffice/trunk/main/offapi/com/sun/star/system/MailClientFlags.idl
    
openoffice/branches/alg/clibboard/main/offapi/com/sun/star/system/SystemMailProvider.idl
      - copied unchanged from r1431511, 
openoffice/trunk/main/offapi/com/sun/star/system/SystemMailProvider.idl
    
openoffice/branches/alg/clibboard/main/offapi/com/sun/star/system/XMailClient.idl
      - copied unchanged from r1431511, 
openoffice/trunk/main/offapi/com/sun/star/system/XMailClient.idl
    
openoffice/branches/alg/clibboard/main/offapi/com/sun/star/system/XMailMessage.idl
      - copied unchanged from r1431511, 
openoffice/trunk/main/offapi/com/sun/star/system/XMailMessage.idl
    
openoffice/branches/alg/clibboard/main/offapi/com/sun/star/system/XSystemMailProvider.idl
      - copied unchanged from r1431511, 
openoffice/trunk/main/offapi/com/sun/star/system/XSystemMailProvider.idl
    openoffice/branches/alg/clibboard/main/shell/source/cmdmail/syscmdmail.cxx
      - copied unchanged from r1431511, 
openoffice/trunk/main/shell/source/cmdmail/syscmdmail.cxx
    openoffice/branches/alg/clibboard/main/shell/source/cmdmail/syscmdmail.hxx
      - copied unchanged from r1431511, 
openoffice/trunk/main/shell/source/cmdmail/syscmdmail.hxx
    openoffice/branches/alg/clibboard/main/shell/source/win32/sysmail/
      - copied from r1431511, openoffice/trunk/main/shell/source/win32/sysmail/
Removed:
    
openoffice/branches/alg/clibboard/main/odk/examples/cpp/complextoolbarcontrols/CalcListener.cxx
    
openoffice/branches/alg/clibboard/main/odk/examples/cpp/complextoolbarcontrols/CalcWindowState.xcu
    
openoffice/branches/alg/clibboard/main/odk/examples/cpp/complextoolbarcontrols/MyJob.cxx
    
openoffice/branches/alg/clibboard/main/odk/examples/cpp/complextoolbarcontrols/MyJob.h
    
openoffice/branches/alg/clibboard/main/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx
    
openoffice/branches/alg/clibboard/main/odk/examples/cpp/complextoolbarcontrols/MyListener.h
    
openoffice/branches/alg/clibboard/main/odk/examples/cpp/complextoolbarcontrols/WriterListener.cxx
    
openoffice/branches/alg/clibboard/main/odk/examples/cpp/complextoolbarcontrols/WriterWindowState.xcu
    
openoffice/branches/alg/clibboard/main/offapi/com/sun/star/system/SimpleCommandMail.idl
    
openoffice/branches/alg/clibboard/main/offapi/com/sun/star/system/SimpleMailClientFlags.idl
    
openoffice/branches/alg/clibboard/main/offapi/com/sun/star/system/SimpleSystemMail.idl
    
openoffice/branches/alg/clibboard/main/offapi/com/sun/star/system/XSimpleMailClient.idl
    
openoffice/branches/alg/clibboard/main/offapi/com/sun/star/system/XSimpleMailClientSupplier.idl
    
openoffice/branches/alg/clibboard/main/offapi/com/sun/star/system/XSimpleMailMessage.idl
    
openoffice/branches/alg/clibboard/main/offapi/com/sun/star/system/XSimpleMailMessage2.idl
    
openoffice/branches/alg/clibboard/main/qadevOOo/objdsc/cmdmail/com.sun.star.comp.system.SimpleCommandMail.csv
    
openoffice/branches/alg/clibboard/main/qadevOOo/objdsc/smplmail/com.sun.star.comp.system.SimpleSystemMail.csv
    
openoffice/branches/alg/clibboard/main/qadevOOo/tests/basic/ifc/system/XSimpleMailClientSupplier/script.xlb
    
openoffice/branches/alg/clibboard/main/qadevOOo/tests/basic/ifc/system/XSimpleMailClientSupplier/system_XSimpleMailClientSupplier.xba
    
openoffice/branches/alg/clibboard/main/qadevOOo/tests/basic/mod/cmdmail/SimpleCommandMail/cmdmail_SimpleCommandMail.xba
    
openoffice/branches/alg/clibboard/main/qadevOOo/tests/basic/mod/cmdmail/SimpleCommandMail/script.xlb
    
openoffice/branches/alg/clibboard/main/qadevOOo/tests/basic/mod/smplmail/SimpleSystemMail/script.xlb
    
openoffice/branches/alg/clibboard/main/qadevOOo/tests/basic/mod/smplmail/SimpleSystemMail/smplmail_SimpleSystemMail.xba
    
openoffice/branches/alg/clibboard/main/qadevOOo/tests/java/ifc/system/_XSimpleMailClientSupplier.java
    
openoffice/branches/alg/clibboard/main/qadevOOo/tests/java/mod/_cmdmail/SimpleCommandMail.java
    
openoffice/branches/alg/clibboard/main/qadevOOo/tests/java/mod/_smplmail/SimpleSystemMail.java
    openoffice/branches/alg/clibboard/main/shell/source/cmdmail/cmdmailsuppl.cxx
    openoffice/branches/alg/clibboard/main/shell/source/cmdmail/cmdmailsuppl.hxx
    
openoffice/branches/alg/clibboard/main/shell/source/win32/simplemail/exports.dxp
    
openoffice/branches/alg/clibboard/main/shell/source/win32/simplemail/makefile.mk
    
openoffice/branches/alg/clibboard/main/shell/source/win32/simplemail/senddoc.cxx
    
openoffice/branches/alg/clibboard/main/shell/source/win32/simplemail/simplemapi.cxx
    
openoffice/branches/alg/clibboard/main/shell/source/win32/simplemail/simplemapi.hxx
    
openoffice/branches/alg/clibboard/main/shell/source/win32/simplemail/smplmail.component
    
openoffice/branches/alg/clibboard/main/shell/source/win32/simplemail/smplmail.xml
    
openoffice/branches/alg/clibboard/main/shell/source/win32/simplemail/smplmailclient.cxx
    
openoffice/branches/alg/clibboard/main/shell/source/win32/simplemail/smplmailclient.hxx
    
openoffice/branches/alg/clibboard/main/shell/source/win32/simplemail/smplmailentry.cxx
    
openoffice/branches/alg/clibboard/main/shell/source/win32/simplemail/smplmailmsg.cxx
    
openoffice/branches/alg/clibboard/main/shell/source/win32/simplemail/smplmailmsg.hxx
    
openoffice/branches/alg/clibboard/main/shell/source/win32/simplemail/smplmailsuppl.cxx
    
openoffice/branches/alg/clibboard/main/shell/source/win32/simplemail/smplmailsuppl.hxx
Modified:
    openoffice/branches/alg/clibboard/   (props changed)
    openoffice/branches/alg/clibboard/ext_libraries/apr-util/makefile.mk
    openoffice/branches/alg/clibboard/ext_libraries/apr/makefile.mk
    openoffice/branches/alg/clibboard/extras/l10n/source/eu/localize.sdf
    openoffice/branches/alg/clibboard/main/boost/boost_freebsd.patch
    
openoffice/branches/alg/clibboard/main/canvas/source/cairo/cairo_devicehelper.cxx
    openoffice/branches/alg/clibboard/main/cli_ure/source/basetypes/assembly.cs
    openoffice/branches/alg/clibboard/main/cli_ure/source/native/assembly.cxx
    
openoffice/branches/alg/clibboard/main/cli_ure/source/native/native_bootstrap.cxx
    openoffice/branches/alg/clibboard/main/cli_ure/source/ure/assembly.cs
    openoffice/branches/alg/clibboard/main/cli_ure/unotypes/makefile.mk
    openoffice/branches/alg/clibboard/main/cppuhelper/source/findsofficepath.c
    openoffice/branches/alg/clibboard/main/cui/source/dialogs/about.cxx
    openoffice/branches/alg/clibboard/main/cui/source/options/optimprove.cxx
    openoffice/branches/alg/clibboard/main/cui/source/options/optimprove2.cxx
    openoffice/branches/alg/clibboard/main/cui/source/options/optlingu.cxx
    openoffice/branches/alg/clibboard/main/desktop/source/app/app.cxx
    
openoffice/branches/alg/clibboard/main/desktop/source/deployment/gui/dp_gui_dialog2.cxx
    
openoffice/branches/alg/clibboard/main/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
    openoffice/branches/alg/clibboard/main/desktop/util/ooverinfo.rc
    openoffice/branches/alg/clibboard/main/desktop/util/verinfo.rc
    
openoffice/branches/alg/clibboard/main/desktop/win32/source/applauncher/ooo/verinfo.rc
    
openoffice/branches/alg/clibboard/main/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx
    
openoffice/branches/alg/clibboard/main/drawinglayer/source/processor2d/vclhelperbitmaprender.cxx
    
openoffice/branches/alg/clibboard/main/drawinglayer/source/processor2d/vclhelperbitmaprender.hxx
    
openoffice/branches/alg/clibboard/main/drawinglayer/source/processor2d/vclprocessor2d.cxx
    openoffice/branches/alg/clibboard/main/embeddedobj/source/msole/oleembed.cxx
    openoffice/branches/alg/clibboard/main/extensions.lst
    
openoffice/branches/alg/clibboard/main/extensions/source/update/check/updatecheck.cxx
    
openoffice/branches/alg/clibboard/main/filter/source/config/cache/constant.hxx
    
openoffice/branches/alg/clibboard/main/filter/source/config/cache/filtercache.cxx
    
openoffice/branches/alg/clibboard/main/filter/source/config/cache/filtercache.hxx
    
openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu
    
openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu
    
openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu
    
openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu
    
openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu
    
openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu
    
openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu
    
openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu
    
openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu
    
openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu
    
openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu
    
openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu
    
openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu
    
openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu
    
openoffice/branches/alg/clibboard/main/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu
    
openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu
    
openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu
    
openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu
    
openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_DOS_StarWriter.xcu
    
openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_WIN_StarWriter.xcu
    
openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu
    
openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/writer_StarWriter_30.xcu
    
openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/writer_StarWriter_40.xcu
    
openoffice/branches/alg/clibboard/main/filter/source/config/fragments/types/writer_StarWriter_50.xcu
    
openoffice/branches/alg/clibboard/main/framework/inc/classes/filtercachedata.hxx
    
openoffice/branches/alg/clibboard/main/framework/inc/dispatch/mailtodispatcher.hxx
    openoffice/branches/alg/clibboard/main/framework/inc/dispatch/systemexec.hxx
    
openoffice/branches/alg/clibboard/main/framework/inc/framework/addonsoptions.hxx
    
openoffice/branches/alg/clibboard/main/framework/inc/pch/precompiled_framework.hxx
    openoffice/branches/alg/clibboard/main/framework/inc/services.h
    
openoffice/branches/alg/clibboard/main/framework/qa/complex/api_internal/api.lst
    
openoffice/branches/alg/clibboard/main/framework/qa/complex/api_internal/worksforme.sce
    
openoffice/branches/alg/clibboard/main/framework/source/dispatch/mailtodispatcher.cxx
    
openoffice/branches/alg/clibboard/main/framework/source/dispatch/systemexec.cxx
    
openoffice/branches/alg/clibboard/main/framework/source/fwe/classes/addonsoptions.cxx
    openoffice/branches/alg/clibboard/main/framework/source/jobs/shelljob.cxx
    
openoffice/branches/alg/clibboard/main/framework/source/layoutmanager/toolbarlayoutmanager.cxx
    
openoffice/branches/alg/clibboard/main/framework/source/services/backingwindow.cxx
    openoffice/branches/alg/clibboard/main/graphite/graphite-2.3.1.patch
    openoffice/branches/alg/clibboard/main/helpauthoring/Addons.xcu
    
openoffice/branches/alg/clibboard/main/helpcontent2/source/text/shared/00/00000021.xhp
    
openoffice/branches/alg/clibboard/main/helpcontent2/source/text/shared/01/06150200.xhp
    
openoffice/branches/alg/clibboard/main/helpcontent2/source/text/shared/guide/assistive.xhp
    
openoffice/branches/alg/clibboard/main/helpcontent2/source/text/shared/guide/language_select.xhp
    
openoffice/branches/alg/clibboard/main/helpcontent2/source/text/shared/guide/scripting.xhp
    
openoffice/branches/alg/clibboard/main/helpcontent2/source/text/shared/optionen/improvement.xhp
    openoffice/branches/alg/clibboard/main/i18npool/source/search/textsearch.cxx
    
openoffice/branches/alg/clibboard/main/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
    
openoffice/branches/alg/clibboard/main/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
    openoffice/branches/alg/clibboard/main/instsetoo_native/util/makefile.mk
    openoffice/branches/alg/clibboard/main/instsetoo_native/util/openoffice.lst
    openoffice/branches/alg/clibboard/main/odk/cfgWin.js
    openoffice/branches/alg/clibboard/main/odk/configure.pl
    openoffice/branches/alg/clibboard/main/odk/docs/install.html
    openoffice/branches/alg/clibboard/main/odk/docs/notsupported.html
    openoffice/branches/alg/clibboard/main/odk/docs/tools.html
    
openoffice/branches/alg/clibboard/main/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Addons.xcu
    
openoffice/branches/alg/clibboard/main/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/Addons.xcu
    
openoffice/branches/alg/clibboard/main/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/Addons.xcu
    
openoffice/branches/alg/clibboard/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/project.mk
    
openoffice/branches/alg/clibboard/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/project.mk
    
openoffice/branches/alg/clibboard/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/project.mk
    
openoffice/branches/alg/clibboard/main/odk/examples/cpp/complextoolbarcontrols/Addons.xcu
    
openoffice/branches/alg/clibboard/main/odk/examples/cpp/complextoolbarcontrols/Makefile
    
openoffice/branches/alg/clibboard/main/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
    
openoffice/branches/alg/clibboard/main/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h
    
openoffice/branches/alg/clibboard/main/odk/examples/cpp/complextoolbarcontrols/exports.cxx
    
openoffice/branches/alg/clibboard/main/odk/examples/cpp/custompanel/description.xml
    
openoffice/branches/alg/clibboard/main/odk/examples/java/Inspector/Addons.xcu
    
openoffice/branches/alg/clibboard/main/odk/examples/java/Inspector/Inspector.java
    openoffice/branches/alg/clibboard/main/odk/pack/copying/dk.mk
    openoffice/branches/alg/clibboard/main/odk/pack/copying/idl_chapter_refs.txt
    openoffice/branches/alg/clibboard/main/odk/setsdkenv_unix
    openoffice/branches/alg/clibboard/main/odk/setsdkenv_unix.sh.in
    openoffice/branches/alg/clibboard/main/odk/setsdkenv_windows.template
    
openoffice/branches/alg/clibboard/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java
    
openoffice/branches/alg/clibboard/main/odk/source/unoapploader/win/unoapploader.c
    openoffice/branches/alg/clibboard/main/odk/util/makefile.pmk
    
openoffice/branches/alg/clibboard/main/offapi/com/sun/star/system/SystemShellExecute.idl
    
openoffice/branches/alg/clibboard/main/offapi/com/sun/star/system/SystemShellExecuteException.idl
    
openoffice/branches/alg/clibboard/main/offapi/com/sun/star/system/SystemShellExecuteFlags.idl
    
openoffice/branches/alg/clibboard/main/offapi/com/sun/star/system/XSystemShellExecute.idl
    
openoffice/branches/alg/clibboard/main/offapi/com/sun/star/system/makefile.mk
    openoffice/branches/alg/clibboard/main/offapi/type_reference/types.rdb
    
openoffice/branches/alg/clibboard/main/officecfg/registry/data/org/openoffice/Setup.xcu
    
openoffice/branches/alg/clibboard/main/officecfg/registry/schema/org/openoffice/Office/Addons.xcs
    
openoffice/branches/alg/clibboard/main/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
    
openoffice/branches/alg/clibboard/main/postprocess/packcomponents/makefile.mk
    openoffice/branches/alg/clibboard/main/postprocess/rebase/coffbase.txt
    openoffice/branches/alg/clibboard/main/postprocess/rebase/no_rebase.txt
    openoffice/branches/alg/clibboard/main/readlicense_oo/docs/readme/readme.xrm
    openoffice/branches/alg/clibboard/main/sal/osl/unx/file.cxx
    openoffice/branches/alg/clibboard/main/sc/source/ui/vba/vbawindow.cxx
    openoffice/branches/alg/clibboard/main/sc/xml/ScXMLExport.xml
    openoffice/branches/alg/clibboard/main/sc/xml/ScXMLImport.xml
    openoffice/branches/alg/clibboard/main/scp2/inc/macros.inc
    openoffice/branches/alg/clibboard/main/scp2/source/ooo/file_library_ooo.scp
    openoffice/branches/alg/clibboard/main/scp2/source/ooo/installation_ooo.scp
    openoffice/branches/alg/clibboard/main/scp2/source/ooo/module_langpack.ulf
    openoffice/branches/alg/clibboard/main/scp2/source/ooo/registryitem_ooo.scp
    openoffice/branches/alg/clibboard/main/scp2/source/ooo/registryitem_ooo.ulf
    openoffice/branches/alg/clibboard/main/scp2/source/ooo/ure.scp
    openoffice/branches/alg/clibboard/main/scp2/source/ooo/ure_standalone.scp
    
openoffice/branches/alg/clibboard/main/scp2/source/quickstart/registryitem_quickstart.scp
    openoffice/branches/alg/clibboard/main/scp2/source/sdkoo/sdkoo.scp
    
openoffice/branches/alg/clibboard/main/scp2/source/winexplorerext/registryitem_winexplorerext.scp
    openoffice/branches/alg/clibboard/main/scp2/util/makefile.mk
    openoffice/branches/alg/clibboard/main/scripting/source/pyprov/mailmerge.py
    openoffice/branches/alg/clibboard/main/sd/source/ui/view/sdview3.cxx
    openoffice/branches/alg/clibboard/main/sd/source/ui/view/sdview4.cxx
    
openoffice/branches/alg/clibboard/main/setup_native/scripts/langpackscript.sh
    openoffice/branches/alg/clibboard/main/setup_native/scripts/update.sh
    
openoffice/branches/alg/clibboard/main/setup_native/source/opensolaris/bundledextensions/README
    
openoffice/branches/alg/clibboard/main/setup_native/source/opensolaris/bundledextensions/ooo_bundled_extensions.xml
    
openoffice/branches/alg/clibboard/main/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions
    
openoffice/branches/alg/clibboard/main/setup_native/source/packinfo/package_names.txt
    
openoffice/branches/alg/clibboard/main/setup_native/source/packinfo/packinfo_office.txt
    
openoffice/branches/alg/clibboard/main/setup_native/source/packinfo/packinfo_office_lang.txt
    
openoffice/branches/alg/clibboard/main/setup_native/source/packinfo/packinfo_sdkoo.txt
    
openoffice/branches/alg/clibboard/main/setup_native/source/packinfo/shellscripts_brand.txt
    
openoffice/branches/alg/clibboard/main/setup_native/source/packinfo/shellscripts_core01.txt
    
openoffice/branches/alg/clibboard/main/setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx
    
openoffice/branches/alg/clibboard/main/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
    
openoffice/branches/alg/clibboard/main/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx
    
openoffice/branches/alg/clibboard/main/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx
    
openoffice/branches/alg/clibboard/main/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx
    
openoffice/branches/alg/clibboard/main/setup_native/source/win32/customactions/relnotes/relnotes.cxx
    
openoffice/branches/alg/clibboard/main/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx
    
openoffice/branches/alg/clibboard/main/setup_native/source/win32/stwrapper/stwrapper.manifest
    openoffice/branches/alg/clibboard/main/sfx2/inc/pch/precompiled_sfx2.hxx
    openoffice/branches/alg/clibboard/main/sfx2/source/appl/appopen.cxx
    openoffice/branches/alg/clibboard/main/sfx2/source/appl/appserv.cxx
    openoffice/branches/alg/clibboard/main/sfx2/source/dialog/mailmodel.cxx
    openoffice/branches/alg/clibboard/main/sfx2/source/view/viewsh.cxx
    openoffice/branches/alg/clibboard/main/shell/inc/internal/config.hxx
    openoffice/branches/alg/clibboard/main/shell/prj/build.lst
    openoffice/branches/alg/clibboard/main/shell/prj/d.lst
    
openoffice/branches/alg/clibboard/main/shell/source/cmdmail/cmdmail.component
    openoffice/branches/alg/clibboard/main/shell/source/cmdmail/cmdmail.xml
    openoffice/branches/alg/clibboard/main/shell/source/cmdmail/cmdmailentry.cxx
    openoffice/branches/alg/clibboard/main/shell/source/cmdmail/cmdmailmsg.cxx
    openoffice/branches/alg/clibboard/main/shell/source/cmdmail/cmdmailmsg.hxx
    openoffice/branches/alg/clibboard/main/shell/source/cmdmail/makefile.mk
    
openoffice/branches/alg/clibboard/main/shell/source/unix/sysshell/recently_used_file_handler.cxx
    
openoffice/branches/alg/clibboard/main/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
    
openoffice/branches/alg/clibboard/main/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
    
openoffice/branches/alg/clibboard/main/shell/source/win32/shlxthandler/res/shlxthdl.manifest
    
openoffice/branches/alg/clibboard/main/shell/source/win32/workbench/TestSmplMail.cxx
    
openoffice/branches/alg/clibboard/main/shell/source/win32/workbench/TestSysShExec.cxx
    
openoffice/branches/alg/clibboard/main/solenv/bin/modules/installer/download.pm
    
openoffice/branches/alg/clibboard/main/solenv/bin/modules/installer/epmfile.pm
    
openoffice/branches/alg/clibboard/main/solenv/bin/modules/installer/simplepackage.pm
    
openoffice/branches/alg/clibboard/main/solenv/bin/modules/installer/windows/msp.pm
    
openoffice/branches/alg/clibboard/main/solenv/bin/modules/installer/ziplist.pm
    openoffice/branches/alg/clibboard/main/stlport/STLport-4.5.patch
    openoffice/branches/alg/clibboard/main/svtools/source/contnr/templwin.cxx
    openoffice/branches/alg/clibboard/main/svx/inc/svx/svdxcgv.hxx
    openoffice/branches/alg/clibboard/main/svx/source/dialog/sendreportw32.cxx
    
openoffice/branches/alg/clibboard/main/svx/source/sdr/contact/viewcontactofsdrpage.cxx
    
openoffice/branches/alg/clibboard/main/svx/source/sdr/overlay/overlaytools.cxx
    openoffice/branches/alg/clibboard/main/svx/source/svdraw/svdoashp.cxx
    openoffice/branches/alg/clibboard/main/svx/source/svdraw/svdoole2.cxx
    openoffice/branches/alg/clibboard/main/svx/source/svdraw/svdxcgv.cxx
    
openoffice/branches/alg/clibboard/main/swext/mediawiki/src/com/sun/star/wiki/Helper.java
    openoffice/branches/alg/clibboard/main/sysui/desktop/debian/control
    
openoffice/branches/alg/clibboard/main/sysui/desktop/freedesktop/freedesktop-menus.spec
    openoffice/branches/alg/clibboard/main/sysui/desktop/macosx/Info.plist
    
openoffice/branches/alg/clibboard/main/sysui/desktop/mandriva/mandriva-menus.spec
    openoffice/branches/alg/clibboard/main/sysui/desktop/productversion.mk
    
openoffice/branches/alg/clibboard/main/sysui/desktop/redhat/redhat-menus.spec
    openoffice/branches/alg/clibboard/main/sysui/desktop/share/brand.pl
    
openoffice/branches/alg/clibboard/main/sysui/desktop/share/create_mime_xml.pl
    openoffice/branches/alg/clibboard/main/sysui/desktop/share/create_tree.sh
    openoffice/branches/alg/clibboard/main/sysui/desktop/share/makefile.mk
    openoffice/branches/alg/clibboard/main/sysui/desktop/share/translate.pl
    openoffice/branches/alg/clibboard/main/sysui/desktop/solaris/makefile.mk
    openoffice/branches/alg/clibboard/main/sysui/desktop/solaris/prototype
    openoffice/branches/alg/clibboard/main/sysui/desktop/suse/suse-menus.spec
    openoffice/branches/alg/clibboard/main/toolkit/source/awt/vclxwindows.cxx
    openoffice/branches/alg/clibboard/main/ucb/source/ucp/file/bc.cxx
    openoffice/branches/alg/clibboard/main/unoil/climaker/makefile.mk
    openoffice/branches/alg/clibboard/main/uui/source/newerverwarn.cxx
    openoffice/branches/alg/clibboard/main/vcl/Library_vclplug_gen.mk
    openoffice/branches/alg/clibboard/main/vcl/inc/vcl/alpha.hxx
    openoffice/branches/alg/clibboard/main/vcl/inc/vcl/bitmap.hxx
    openoffice/branches/alg/clibboard/main/vcl/inc/vcl/button.hxx
    openoffice/branches/alg/clibboard/main/vcl/inc/vcl/combobox.hxx
    openoffice/branches/alg/clibboard/main/vcl/inc/vcl/ctrl.hxx
    openoffice/branches/alg/clibboard/main/vcl/inc/vcl/dialog.hxx
    openoffice/branches/alg/clibboard/main/vcl/inc/vcl/dockingarea.hxx
    openoffice/branches/alg/clibboard/main/vcl/inc/vcl/event.hxx
    openoffice/branches/alg/clibboard/main/vcl/inc/vcl/field.hxx
    openoffice/branches/alg/clibboard/main/vcl/inc/vcl/fixed.hxx
    openoffice/branches/alg/clibboard/main/vcl/inc/vcl/floatwin.hxx
    openoffice/branches/alg/clibboard/main/vcl/inc/vcl/fontmanager.hxx
    openoffice/branches/alg/clibboard/main/vcl/inc/vcl/group.hxx
    openoffice/branches/alg/clibboard/main/vcl/inc/vcl/lstbox.hxx
    openoffice/branches/alg/clibboard/main/vcl/inc/vcl/menu.hxx
    openoffice/branches/alg/clibboard/main/vcl/inc/vcl/menubtn.hxx
    openoffice/branches/alg/clibboard/main/vcl/inc/vcl/metaact.hxx
    openoffice/branches/alg/clibboard/main/vcl/inc/vcl/morebtn.hxx
    openoffice/branches/alg/clibboard/main/vcl/inc/vcl/pngread.hxx
    openoffice/branches/alg/clibboard/main/vcl/inc/vcl/scrbar.hxx
    openoffice/branches/alg/clibboard/main/vcl/inc/vcl/spin.hxx
    openoffice/branches/alg/clibboard/main/vcl/inc/vcl/spinfld.hxx
    openoffice/branches/alg/clibboard/main/vcl/inc/vcl/split.hxx
    openoffice/branches/alg/clibboard/main/vcl/inc/vcl/syschild.hxx
    openoffice/branches/alg/clibboard/main/vcl/inc/vcl/tabpage.hxx
    openoffice/branches/alg/clibboard/main/vcl/inc/vcl/virdev.hxx
    openoffice/branches/alg/clibboard/main/vcl/inc/vcl/wrkwin.hxx
    openoffice/branches/alg/clibboard/main/vcl/source/app/settings.cxx
    openoffice/branches/alg/clibboard/main/vcl/source/window/toolbox.cxx
    
openoffice/branches/alg/clibboard/main/xmerge/source/activesync/XMergeFilter.cpp
    
openoffice/branches/alg/clibboard/main/xmerge/source/aportisdoc/converter.xml
    
openoffice/branches/alg/clibboard/main/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/package.html
    openoffice/branches/alg/clibboard/main/xmerge/source/htmlsoff/converter.xml
    openoffice/branches/alg/clibboard/main/xmerge/source/htmlsoff/package.html
    openoffice/branches/alg/clibboard/main/xmerge/source/minicalc/converter.xml
    openoffice/branches/alg/clibboard/main/xmerge/source/pexcel/converter.xml
    
openoffice/branches/alg/clibboard/main/xmerge/source/pocketword/converter.xml
    
openoffice/branches/alg/clibboard/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java
    
openoffice/branches/alg/clibboard/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java
    
openoffice/branches/alg/clibboard/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PluginFactoryImpl.java
    
openoffice/branches/alg/clibboard/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java
    openoffice/branches/alg/clibboard/main/xmerge/source/wordsmith/converter.xml
    openoffice/branches/alg/clibboard/main/xmerge/source/xmerge/build.xml
    
openoffice/branches/alg/clibboard/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java
    
openoffice/branches/alg/clibboard/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
    
openoffice/branches/alg/clibboard/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java
    openoffice/branches/alg/clibboard/main/xmerge/util/build.xml
    openoffice/branches/alg/clibboard/main/xmerge/util/xmerge.mf
    
openoffice/branches/alg/clibboard/main/xmlhelp/source/cxxhelp/provider/makefile.mk
    
openoffice/branches/alg/clibboard/main/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
    
openoffice/branches/alg/clibboard/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
    openoffice/branches/alg/clibboard/test/   (props changed)
    openoffice/branches/alg/clibboard/test/build.xml
    
openoffice/branches/alg/clibboard/test/testcommon/source/org/openoffice/test/Run.java
    
openoffice/branches/alg/clibboard/test/testcommon/source/org/openoffice/test/common/XMLReporter.java

Propchange: openoffice/branches/alg/clibboard/
------------------------------------------------------------------------------
  Merged /openoffice/trunk:r1428975-1431511,1431513-1434611

Modified: openoffice/branches/alg/clibboard/ext_libraries/apr-util/makefile.mk
URL: 
http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/ext_libraries/apr-util/makefile.mk?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/ext_libraries/apr-util/makefile.mk 
(original)
+++ openoffice/branches/alg/clibboard/ext_libraries/apr-util/makefile.mk Thu 
Jan 17 11:06:13 2013
@@ -62,7 +62,7 @@ CONFIGURE_FLAGS=
 
 BUILD_DIR=$(CONFIGURE_DIR)
 BUILD_ACTION=$(GNUMAKE)
-BUILD_FLAGS+= -j$(EXTMAXPROCESS)
+#BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 
 .ELIF "$(GUI)" == "OS2"
 

Modified: openoffice/branches/alg/clibboard/ext_libraries/apr/makefile.mk
URL: 
http://svn.apache.org/viewvc/openoffice/branches/alg/clibboard/ext_libraries/apr/makefile.mk?rev=1434615&r1=1434614&r2=1434615&view=diff
==============================================================================
--- openoffice/branches/alg/clibboard/ext_libraries/apr/makefile.mk (original)
+++ openoffice/branches/alg/clibboard/ext_libraries/apr/makefile.mk Thu Jan 17 
11:06:13 2013
@@ -66,8 +66,8 @@ CONFIGURE_ACTION=.$/configure --prefix=$
 CONFIGURE_FLAGS=
 
 BUILD_DIR=$(CONFIGURE_DIR)
-BUILD_ACTION=$(GNUMAKE)
-BUILD_FLAGS+= -j$(EXTMAXPROCESS)
+BUILD_ACTION=$(GNUMAKE) --debug=b
+#BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 
 # Make apr-1-config believe that apr has been installed.
 INSTALL_ACTION=if [ -f apr-1-config.orig ]; then mv -f apr-1-config.orig 
apr-1-config; fi;     \


Reply via email to