openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1504925 [1/12] - in /openoffice/branches/rejuvenate01: ext_libraries/apr-util/ ext_libraries/coinmp/ ext_libraries/serf/ ext_libraries/serf/win/ ext_sources/ main/ main/accessibility/bridge/org/openoffice/java/accessibility/ main/basctl/so...
Date Fri, 19 Jul 2013 15:59:11 GMT
Author: hdu
Date: Fri Jul 19 15:59:04 2013
New Revision: 1504925

URL: http://svn.apache.org/r1504925
Log:
merge AOO400 into rejuvente01 branch

Added:
    openoffice/branches/rejuvenate01/ext_libraries/apr-util/apr-util-1.4.1.expat.patch
      - copied unchanged from r1504851, openoffice/trunk/ext_libraries/apr-util/apr-util-1.4.1.expat.patch
    openoffice/branches/rejuvenate01/ext_libraries/serf/serf-1.2.1.ldl.patch
      - copied unchanged from r1504851, openoffice/trunk/ext_libraries/serf/serf-1.2.1.ldl.patch
    openoffice/branches/rejuvenate01/ext_libraries/serf/serf-1.2.1.libs.patch
      - copied unchanged from r1504851, openoffice/trunk/ext_libraries/serf/serf-1.2.1.libs.patch
    openoffice/branches/rejuvenate01/ext_libraries/serf/serf-1.2.1.logging.patch
      - copied unchanged from r1504851, openoffice/trunk/ext_libraries/serf/serf-1.2.1.logging.patch
    openoffice/branches/rejuvenate01/main/boost/boost-os2.patch
      - copied unchanged from r1504851, openoffice/trunk/main/boost/boost-os2.patch
    openoffice/branches/rejuvenate01/main/desktop/source/deployment/gui/deploymentgui.map
      - copied unchanged from r1504851, openoffice/trunk/main/desktop/source/deployment/gui/deploymentgui.map
    openoffice/branches/rejuvenate01/main/desktop/source/deployment/gui/dp_gui_handleversionexception.cxx
      - copied unchanged from r1504851, openoffice/trunk/main/desktop/source/deployment/gui/dp_gui_handleversionexception.cxx
    openoffice/branches/rejuvenate01/main/desktop/source/deployment/inc/dp_gui.mk
      - copied unchanged from r1504851, openoffice/trunk/main/desktop/source/deployment/inc/dp_gui.mk
    openoffice/branches/rejuvenate01/main/desktop/source/inc/dp_gui_api.hxx
      - copied unchanged from r1504851, openoffice/trunk/main/desktop/source/inc/dp_gui_api.hxx
    openoffice/branches/rejuvenate01/main/desktop/source/inc/dp_gui_handleversionexception.hxx
      - copied unchanged from r1504851, openoffice/trunk/main/desktop/source/inc/dp_gui_handleversionexception.hxx
    openoffice/branches/rejuvenate01/main/hsqldb/patches/i121754.patch
      - copied unchanged from r1504851, openoffice/trunk/main/hsqldb/patches/i121754.patch
    openoffice/branches/rejuvenate01/main/odk/pack/gendocu/idl_ref_javadoc.patch
      - copied unchanged from r1504851, openoffice/trunk/main/odk/pack/gendocu/idl_ref_javadoc.patch
    openoffice/branches/rejuvenate01/main/python/python-2.7.5-mingw.patch
      - copied unchanged from r1504851, openoffice/trunk/main/python/python-2.7.5-mingw.patch
    openoffice/branches/rejuvenate01/main/python/python-2.7.5-nohardlink.patch
      - copied unchanged from r1504851, openoffice/trunk/main/python/python-2.7.5-nohardlink.patch
    openoffice/branches/rejuvenate01/main/python/python-2.7.5-pcbuild.patch
      - copied unchanged from r1504851, openoffice/trunk/main/python/python-2.7.5-pcbuild.patch
    openoffice/branches/rejuvenate01/main/python/python-2.7.5-sysbase.patch
      - copied unchanged from r1504851, openoffice/trunk/main/python/python-2.7.5-sysbase.patch
    openoffice/branches/rejuvenate01/main/python/python-solver-before-std.patch
      - copied unchanged from r1504851, openoffice/trunk/main/python/python-solver-before-std.patch
    openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sidebar/GridLayouter.hxx
      - copied unchanged from r1504851, openoffice/trunk/main/sfx2/inc/sfx2/sidebar/GridLayouter.hxx
    openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sidebar/Layouter.hxx
      - copied unchanged from r1504851, openoffice/trunk/main/sfx2/inc/sfx2/sidebar/Layouter.hxx
    openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sidebar/Sidebar.hxx
      - copied unchanged from r1504851, openoffice/trunk/main/sfx2/inc/sfx2/sidebar/Sidebar.hxx
    openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/GridLayouter.cxx
      - copied unchanged from r1504851, openoffice/trunk/main/sfx2/source/sidebar/GridLayouter.cxx
    openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/Layouter.cxx
      - copied unchanged from r1504851, openoffice/trunk/main/sfx2/source/sidebar/Layouter.cxx
Removed:
    openoffice/branches/rejuvenate01/ext_libraries/apr-util/apr-util-1.4.1.mac.expat.patch
    openoffice/branches/rejuvenate01/ext_libraries/serf/serf-1.2.0.ldl.patch
    openoffice/branches/rejuvenate01/ext_libraries/serf/serf-1.2.0.libs.patch
    openoffice/branches/rejuvenate01/ext_libraries/serf/serf-1.2.0.logging.patch
    openoffice/branches/rejuvenate01/ext_sources/c57477edd6d18bd9eeca2f21add73919-Python-2.7.3.tar.bz2
    openoffice/branches/rejuvenate01/main/default_images/svx/res/symphony/DecreaseSpace_16x16.png
    openoffice/branches/rejuvenate01/main/default_images/svx/res/symphony/IncreaseSpace_16x16.png
    openoffice/branches/rejuvenate01/main/hsqldb/patches/i103528.patch
    openoffice/branches/rejuvenate01/main/hsqldb/patches/i104901.patch
    openoffice/branches/rejuvenate01/main/hsqldb/patches/i96823.patch
    openoffice/branches/rejuvenate01/main/hsqldb/patches/i97032.patch
    openoffice/branches/rejuvenate01/main/instsetoo_native/res/
    openoffice/branches/rejuvenate01/main/python/python-2.7.3-mingw.patch
    openoffice/branches/rejuvenate01/main/python/python-2.7.4-nohardlink.patch
    openoffice/branches/rejuvenate01/main/python/python-2.7.4-pcbuild.patch
    openoffice/branches/rejuvenate01/main/python/python-2.7.4-sysbase.patch
    openoffice/branches/rejuvenate01/main/sdext/source/pdfimport/xpdftest/binary_1_out.def
    openoffice/branches/rejuvenate01/main/sdext/source/pdfimport/xpdftest/book.pdf
    openoffice/branches/rejuvenate01/main/sdext/source/pdfimport/xpdftest/text_1_out.def
    openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/Sidebar.hxx
Modified:
    openoffice/branches/rejuvenate01/ext_libraries/apr-util/makefile.mk
    openoffice/branches/rejuvenate01/ext_libraries/coinmp/makefile.mk
    openoffice/branches/rejuvenate01/ext_libraries/serf/makefile.mk
    openoffice/branches/rejuvenate01/ext_libraries/serf/serf_version.mk
    openoffice/branches/rejuvenate01/ext_libraries/serf/win/Library_serf.mk
    openoffice/branches/rejuvenate01/ext_libraries/serf/win/Package_inc.mk
    openoffice/branches/rejuvenate01/main/LICENSE
    openoffice/branches/rejuvenate01/main/LICENSE_ALv2
    openoffice/branches/rejuvenate01/main/NOTICE
    openoffice/branches/rejuvenate01/main/RepositoryFixes.mk
    openoffice/branches/rejuvenate01/main/accessibility/bridge/org/openoffice/java/accessibility/ComboBox.java
    openoffice/branches/rejuvenate01/main/accessibility/bridge/org/openoffice/java/accessibility/Dialog.java
    openoffice/branches/rejuvenate01/main/accessibility/bridge/org/openoffice/java/accessibility/Frame.java
    openoffice/branches/rejuvenate01/main/accessibility/bridge/org/openoffice/java/accessibility/Window.java
    openoffice/branches/rejuvenate01/main/basctl/source/basicide/baside2b.cxx
    openoffice/branches/rejuvenate01/main/basegfx/source/vector/b2dvector.cxx
    openoffice/branches/rejuvenate01/main/boost/makefile.mk
    openoffice/branches/rejuvenate01/main/canvas/source/vcl/canvascustomsprite.cxx
    openoffice/branches/rejuvenate01/main/chart2/source/inc/InternalDataProvider.hxx
    openoffice/branches/rejuvenate01/main/chart2/source/tools/ChartModelHelper.cxx
    openoffice/branches/rejuvenate01/main/chart2/source/tools/ExplicitCategoriesProvider.cxx
    openoffice/branches/rejuvenate01/main/chart2/source/tools/InternalDataProvider.cxx
    openoffice/branches/rejuvenate01/main/cli_ure/source/native/native_bootstrap.cxx
    openoffice/branches/rejuvenate01/main/configmgr/source/partial.cxx
    openoffice/branches/rejuvenate01/main/configure.in
    openoffice/branches/rejuvenate01/main/connectivity/source/resource/conn_shared_res.src
    openoffice/branches/rejuvenate01/main/cppcanvas/source/mtfrenderer/implrenderer.cxx
    openoffice/branches/rejuvenate01/main/cppuhelper/source/findsofficepath.c
    openoffice/branches/rejuvenate01/main/cui/source/dialogs/cuifmsearch.cxx
    openoffice/branches/rejuvenate01/main/cui/source/inc/cuifmsearch.hxx
    openoffice/branches/rejuvenate01/main/cui/source/options/optsave.cxx
    openoffice/branches/rejuvenate01/main/cui/source/tabpages/swpossizetabpage.cxx
    openoffice/branches/rejuvenate01/main/cui/source/tabpages/textattr.cxx
    openoffice/branches/rejuvenate01/main/cui/source/tabpages/transfrm.cxx
    openoffice/branches/rejuvenate01/main/dbaccess/source/ui/inc/QueryTableView.hxx
    openoffice/branches/rejuvenate01/main/dbaccess/source/ui/querydesign/QueryTableView.cxx
    openoffice/branches/rejuvenate01/main/default_images/framework/res/backing.png
    openoffice/branches/rejuvenate01/main/default_images/framework/res/backing_hc.png
    openoffice/branches/rejuvenate01/main/default_images/framework/res/backing_right.png
    openoffice/branches/rejuvenate01/main/default_images/framework/res/backing_right_hc.png
    openoffice/branches/rejuvenate01/main/default_images/framework/res/backing_rtl_left.png
    openoffice/branches/rejuvenate01/main/default_images/framework/res/backing_rtl_left_hc.png
    openoffice/branches/rejuvenate01/main/default_images/framework/res/backing_rtl_right.png
    openoffice/branches/rejuvenate01/main/default_images/framework/res/backing_rtl_right_hc.png
    openoffice/branches/rejuvenate01/main/default_images/framework/res/info_26.png
    openoffice/branches/rejuvenate01/main/default_images/introabout/about.png
    openoffice/branches/rejuvenate01/main/default_images/introabout/intro.png
    openoffice/branches/rejuvenate01/main/default_images/introabout/logo.png
    openoffice/branches/rejuvenate01/main/default_images/res/mainapp_16.png
    openoffice/branches/rejuvenate01/main/default_images/res/mainapp_16_8.png
    openoffice/branches/rejuvenate01/main/default_images/res/mainapp_32.png
    openoffice/branches/rejuvenate01/main/default_images/res/mainapp_32_8.png
    openoffice/branches/rejuvenate01/main/default_images/res/mainapp_48_8.png
    openoffice/branches/rejuvenate01/main/desktop/prj/build.lst
    openoffice/branches/rejuvenate01/main/desktop/prj/d.lst
    openoffice/branches/rejuvenate01/main/desktop/scripts/unoinfo.sh
    openoffice/branches/rejuvenate01/main/desktop/scripts/unopkg.sh
    openoffice/branches/rejuvenate01/main/desktop/source/app/app.cxx
    openoffice/branches/rejuvenate01/main/desktop/source/app/makefile.mk
    openoffice/branches/rejuvenate01/main/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
    openoffice/branches/rejuvenate01/main/desktop/source/deployment/gui/dp_gui_service.cxx
    openoffice/branches/rejuvenate01/main/desktop/source/deployment/gui/makefile.mk
    openoffice/branches/rejuvenate01/main/desktop/source/migration/migration.cxx
    openoffice/branches/rejuvenate01/main/desktop/source/migration/services/cexports.cxx
    openoffice/branches/rejuvenate01/main/desktop/source/migration/services/makefile.mk
    openoffice/branches/rejuvenate01/main/desktop/source/migration/services/migrationoo2.component
    openoffice/branches/rejuvenate01/main/desktop/source/migration/services/oo3extensionmigration.cxx
    openoffice/branches/rejuvenate01/main/desktop/source/migration/wizard.cxx
    openoffice/branches/rejuvenate01/main/desktop/source/migration/wizard.hxx
    openoffice/branches/rejuvenate01/main/desktop/source/splash/splash.cxx
    openoffice/branches/rejuvenate01/main/desktop/source/splash/splash.hxx
    openoffice/branches/rejuvenate01/main/desktop/win32/source/unoinfo.cxx
    openoffice/branches/rejuvenate01/main/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx
    openoffice/branches/rejuvenate01/main/drawinglayer/source/primitive2d/primitivetools2d.cxx
    openoffice/branches/rejuvenate01/main/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
    openoffice/branches/rejuvenate01/main/drawinglayer/source/processor2d/vclprocessor2d.cxx
    openoffice/branches/rejuvenate01/main/dtrans/source/win32/dtobj/FetcList.cxx
    openoffice/branches/rejuvenate01/main/editeng/source/editeng/impedit2.cxx
    openoffice/branches/rejuvenate01/main/extensions.lst
    openoffice/branches/rejuvenate01/main/extensions/source/ole/makefile.mk
    openoffice/branches/rejuvenate01/main/external_deps.lst
    openoffice/branches/rejuvenate01/main/filter/source/msfilter/escherex.cxx
    openoffice/branches/rejuvenate01/main/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
    openoffice/branches/rejuvenate01/main/framework/source/uielement/popuptoolbarcontroller.cxx
    openoffice/branches/rejuvenate01/main/helpcontent2/source/text/sbasic/shared/03090301.xhp
    openoffice/branches/rejuvenate01/main/helpcontent2/source/text/scalc/01/03080000.xhp
    openoffice/branches/rejuvenate01/main/helpcontent2/source/text/shared/01/01100200.xhp
    openoffice/branches/rejuvenate01/main/helpcontent2/source/text/shared/01/extensionupdate.xhp
    openoffice/branches/rejuvenate01/main/helpcontent2/source/text/shared/01/packagemanager.xhp
    openoffice/branches/rejuvenate01/main/hsqldb/makefile.mk
    openoffice/branches/rejuvenate01/main/i18npool/source/localedata/data/pt_PT.xml
    openoffice/branches/rejuvenate01/main/i18npool/source/search/textsearch.cxx
    openoffice/branches/rejuvenate01/main/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp
    openoffice/branches/rejuvenate01/main/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp
    openoffice/branches/rejuvenate01/main/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp
    openoffice/branches/rejuvenate01/main/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp
    openoffice/branches/rejuvenate01/main/instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt
    openoffice/branches/rejuvenate01/main/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp
    openoffice/branches/rejuvenate01/main/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp
    openoffice/branches/rejuvenate01/main/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
    openoffice/branches/rejuvenate01/main/instsetoo_native/util/makefile.mk
    openoffice/branches/rejuvenate01/main/instsetoo_native/util/openoffice.lst
    openoffice/branches/rejuvenate01/main/javaunohelper/com/sun/star/comp/helper/UnoInfo.java
    openoffice/branches/rejuvenate01/main/odk/cfgWin.js
    openoffice/branches/rejuvenate01/main/odk/configure.pl
    openoffice/branches/rejuvenate01/main/odk/docs/images/ooo-main-app_32.png
    openoffice/branches/rejuvenate01/main/odk/docs/images/sdk_head-1.png
    openoffice/branches/rejuvenate01/main/odk/docs/install.html
    openoffice/branches/rejuvenate01/main/odk/examples/DevelopersGuide/Forms/DocumentViewHelper.java
    openoffice/branches/rejuvenate01/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
    openoffice/branches/rejuvenate01/main/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx
    openoffice/branches/rejuvenate01/main/odk/examples/cpp/complextoolbarcontrols/Makefile
    openoffice/branches/rejuvenate01/main/odk/index.html
    openoffice/branches/rejuvenate01/main/odk/pack/gendocu/makefile.mk
    openoffice/branches/rejuvenate01/main/odk/setsdkenv_unix.sh.in
    openoffice/branches/rejuvenate01/main/odk/setsdkenv_windows.template
    openoffice/branches/rejuvenate01/main/odk/settings/settings.mk
    openoffice/branches/rejuvenate01/main/odk/settings/std.mk
    openoffice/branches/rejuvenate01/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java
    openoffice/branches/rejuvenate01/main/odk/source/unoapploader/unx/unoapploader.c
    openoffice/branches/rejuvenate01/main/odk/util/makefile.pmk
    openoffice/branches/rejuvenate01/main/offapi/com/sun/star/awt/grid/XGridColumn.idl
    openoffice/branches/rejuvenate01/main/officecfg/registry/data/org/openoffice/Inet.xcu
    openoffice/branches/rejuvenate01/main/officecfg/registry/data/org/openoffice/Office/Common.xcu
    openoffice/branches/rejuvenate01/main/officecfg/registry/data/org/openoffice/Office/SFX.xcu
    openoffice/branches/rejuvenate01/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
    openoffice/branches/rejuvenate01/main/officecfg/registry/data/org/openoffice/Office/Writer.xcu
    openoffice/branches/rejuvenate01/main/officecfg/registry/data/org/openoffice/Office/makefile.mk
    openoffice/branches/rejuvenate01/main/officecfg/registry/data/org/openoffice/Setup.xcu
    openoffice/branches/rejuvenate01/main/officecfg/registry/schema/org/openoffice/Office/Common.xcs
    openoffice/branches/rejuvenate01/main/padmin/source/spadmin.sh
    openoffice/branches/rejuvenate01/main/python/makefile.mk
    openoffice/branches/rejuvenate01/main/python/prj/d.lst
    openoffice/branches/rejuvenate01/main/python/python-freebsd.patch
    openoffice/branches/rejuvenate01/main/python/python-md5.patch
    openoffice/branches/rejuvenate01/main/python/python-solaris.patch
    openoffice/branches/rejuvenate01/main/python/python-ssl.patch
    openoffice/branches/rejuvenate01/main/python/pyversion.mk
    openoffice/branches/rejuvenate01/main/pyuno/source/module/pyuno.cxx
    openoffice/branches/rejuvenate01/main/pyuno/source/module/pyuno_callable.cxx
    openoffice/branches/rejuvenate01/main/pyuno/source/module/pyuno_impl.hxx
    openoffice/branches/rejuvenate01/main/pyuno/zipcore/python.sh
    openoffice/branches/rejuvenate01/main/sal/inc/sal/mathconf.h
    openoffice/branches/rejuvenate01/main/sal/systools/win32/kill/makefile.mk
    openoffice/branches/rejuvenate01/main/sc/inc/document.hxx
    openoffice/branches/rejuvenate01/main/sc/inc/drwlayer.hxx
    openoffice/branches/rejuvenate01/main/sc/source/core/data/documen2.cxx
    openoffice/branches/rejuvenate01/main/sc/source/core/data/documen9.cxx
    openoffice/branches/rejuvenate01/main/sc/source/core/data/drwlayer.cxx
    openoffice/branches/rejuvenate01/main/sc/source/filter/html/htmlpars.cxx
    openoffice/branches/rejuvenate01/main/sc/source/ui/docshell/dbdocfun.cxx
    openoffice/branches/rejuvenate01/main/sc/source/ui/docshell/docfunc.cxx
    openoffice/branches/rejuvenate01/main/sc/source/ui/docshell/docsh.cxx
    openoffice/branches/rejuvenate01/main/sc/source/ui/drawfunc/futext3.cxx
    openoffice/branches/rejuvenate01/main/sc/source/ui/inc/undobase.hxx
    openoffice/branches/rejuvenate01/main/sc/source/ui/inc/undodraw.hxx
    openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
    openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx
    openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
    openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
    openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
    openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx
    openoffice/branches/rejuvenate01/main/sc/source/ui/undo/undobase.cxx
    openoffice/branches/rejuvenate01/main/sc/source/ui/undo/undodraw.cxx
    openoffice/branches/rejuvenate01/main/sc/source/ui/unoobj/chart2uno.cxx
    openoffice/branches/rejuvenate01/main/sc/source/ui/view/drawview.cxx
    openoffice/branches/rejuvenate01/main/sc/source/ui/view/gridwin.cxx
    openoffice/branches/rejuvenate01/main/sc/source/ui/view/viewfun6.cxx
    openoffice/branches/rejuvenate01/main/scp2/source/ooo/common_brand.scp
    openoffice/branches/rejuvenate01/main/scp2/source/ooo/file_library_ooo.scp
    openoffice/branches/rejuvenate01/main/scp2/source/ooo/registryitem_ooo.scp
    openoffice/branches/rejuvenate01/main/scp2/source/winexplorerext/registryitem_winexplorerext.scp
    openoffice/branches/rejuvenate01/main/scripting/source/pyprov/pythonscript.py
    openoffice/branches/rejuvenate01/main/sd/inc/app.hrc
    openoffice/branches/rejuvenate01/main/sd/sdi/ViewShellBase.sdi
    openoffice/branches/rejuvenate01/main/sd/sdi/sdraw.sdi
    openoffice/branches/rejuvenate01/main/sd/source/core/drawdoc3.cxx
    openoffice/branches/rejuvenate01/main/sd/source/ui/app/sdmod1.cxx
    openoffice/branches/rejuvenate01/main/sd/source/ui/framework/tools/FrameworkHelper.cxx
    openoffice/branches/rejuvenate01/main/sd/source/ui/inc/framework/FrameworkHelper.hxx
    openoffice/branches/rejuvenate01/main/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
    openoffice/branches/rejuvenate01/main/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
    openoffice/branches/rejuvenate01/main/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
    openoffice/branches/rejuvenate01/main/sd/source/ui/table/tablefunction.cxx
    openoffice/branches/rejuvenate01/main/sd/source/ui/view/GraphicViewShellBase.cxx
    openoffice/branches/rejuvenate01/main/sd/source/ui/view/ViewShellBase.cxx
    openoffice/branches/rejuvenate01/main/sd/source/ui/view/ViewShellImplementation.cxx
    openoffice/branches/rejuvenate01/main/sd/source/ui/view/drviews6.cxx
    openoffice/branches/rejuvenate01/main/sdext/source/pdfimport/xpdftest/makefile.mk
    openoffice/branches/rejuvenate01/main/setup_native/source/mac/ooo/DS_Store
    openoffice/branches/rejuvenate01/main/setup_native/source/mac/ooo/DS_Store_Dev
    openoffice/branches/rejuvenate01/main/setup_native/source/mac/ooo/osxdndinstall.png
    openoffice/branches/rejuvenate01/main/setup_native/source/mac/ooo/osxdndinstall_lang.png
    openoffice/branches/rejuvenate01/main/setup_native/source/mac/ooo/osxdndinstall_nologo.png
    openoffice/branches/rejuvenate01/main/setup_native/source/mac/ooo3_installer.icns
    openoffice/branches/rejuvenate01/main/setup_native/source/mac/sdk/DS_Store_SDK
    openoffice/branches/rejuvenate01/main/setup_native/source/mac/sdk/osxdndinstall_sdk.png
    openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/indexingfilter/makefile.mk
    openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/javafilter/makefile.mk
    openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/languagepacks/makefile.mk
    openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/patch/makefile.mk
    openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/patch/swappatchfiles.cxx
    openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/quickstarter/makefile.mk
    openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/rebase/makefile.mk
    openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk
    openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/regactivex/makefile.mk
    openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/relnotes/makefile.mk
    openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/shellextensions/makefile.mk
    openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/tools/makefile.mk
    openoffice/branches/rejuvenate01/main/setup_native/source/win32/nsis/ooobanner.bmp
    openoffice/branches/rejuvenate01/main/setup_native/source/win32/nsis/ooobitmap.bmp
    openoffice/branches/rejuvenate01/main/setup_native/source/win32/nsis/ooosdkbanner.bmp
    openoffice/branches/rejuvenate01/main/setup_native/source/win32/nsis/ooosdkbitmap.bmp
    openoffice/branches/rejuvenate01/main/setup_native/source/win32/nsis/ooosetup.ico
    openoffice/branches/rejuvenate01/main/sfx2/Library_sfx.mk
    openoffice/branches/rejuvenate01/main/sfx2/Package_inc.mk
    openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sidebar/ControllerItem.hxx
    openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sidebar/SidebarToolBox.hxx
    openoffice/branches/rejuvenate01/main/sfx2/source/doc/docfile.cxx
    openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/Accessible.hxx
    openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/AsynchronousCall.cxx
    openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/AsynchronousCall.hxx
    openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/ControllerItem.cxx
    openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/Sidebar.cxx
    openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/SidebarController.cxx
    openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/SidebarController.hxx
    openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/SidebarDockingWindow.hxx
    openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/TabBar.cxx
    openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/Theme.cxx
    openoffice/branches/rejuvenate01/main/sfx2/source/view/viewsh.cxx
    openoffice/branches/rejuvenate01/main/slideshow/source/engine/slideshowimpl.cxx
    openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/control.pm
    openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/epmfile.pm
    openoffice/branches/rejuvenate01/main/solenv/bin/srcrelease.xml
    openoffice/branches/rejuvenate01/main/solenv/gbuild/gbuild.mk
    openoffice/branches/rejuvenate01/main/solenv/gbuild/platform/windows.mk
    openoffice/branches/rejuvenate01/main/solenv/inc/minor.mk
    openoffice/branches/rejuvenate01/main/solenv/inc/set_wntx64.mk
    openoffice/branches/rejuvenate01/main/solenv/inc/wntmsci11.mk
    openoffice/branches/rejuvenate01/main/soltools/mkdepend/makefile.mk
    openoffice/branches/rejuvenate01/main/stlport/prj/build.lst
    openoffice/branches/rejuvenate01/main/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
    openoffice/branches/rejuvenate01/main/svgio/inc/svgio/svgreader/svgtoken.hxx
    openoffice/branches/rejuvenate01/main/svgio/source/svgreader/svgcharacternode.cxx
    openoffice/branches/rejuvenate01/main/svgio/source/svgreader/svgdocumenthandler.cxx
    openoffice/branches/rejuvenate01/main/svgio/source/svgreader/svgnode.cxx
    openoffice/branches/rejuvenate01/main/svgio/source/svgreader/svgstyleattributes.cxx
    openoffice/branches/rejuvenate01/main/svgio/source/svgreader/svgsvgnode.cxx
    openoffice/branches/rejuvenate01/main/svgio/source/svgreader/svgtoken.cxx
    openoffice/branches/rejuvenate01/main/svl/inc/svl/undo.hxx
    openoffice/branches/rejuvenate01/main/svl/source/undo/undo.cxx
    openoffice/branches/rejuvenate01/main/svtools/Executable_bmp.mk
    openoffice/branches/rejuvenate01/main/svtools/Executable_bmpsum.mk
    openoffice/branches/rejuvenate01/main/svtools/Executable_g2g.mk
    openoffice/branches/rejuvenate01/main/svtools/source/control/ctrlbox.cxx
    openoffice/branches/rejuvenate01/main/svtools/source/control/valueset.cxx
    openoffice/branches/rejuvenate01/main/svtools/source/table/tablecontrol_impl.cxx
    openoffice/branches/rejuvenate01/main/svx/inc/svx/svdmodel.hxx
    openoffice/branches/rejuvenate01/main/svx/inc/svx/svdobj.hxx
    openoffice/branches/rejuvenate01/main/svx/inc/svx/svdotable.hxx
    openoffice/branches/rejuvenate01/main/svx/inc/svx/svdotext.hxx
    openoffice/branches/rejuvenate01/main/svx/source/sidebar/area/AreaPropertyPanel.cxx
    openoffice/branches/rejuvenate01/main/svx/source/sidebar/area/AreaPropertyPanel.hxx
    openoffice/branches/rejuvenate01/main/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
    openoffice/branches/rejuvenate01/main/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
    openoffice/branches/rejuvenate01/main/svx/source/sidebar/line/LinePropertyPanel.cxx
    openoffice/branches/rejuvenate01/main/svx/source/sidebar/line/LinePropertyPanel.hrc
    openoffice/branches/rejuvenate01/main/svx/source/sidebar/line/LinePropertyPanel.hxx
    openoffice/branches/rejuvenate01/main/svx/source/sidebar/line/LinePropertyPanel.src
    openoffice/branches/rejuvenate01/main/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
    openoffice/branches/rejuvenate01/main/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
    openoffice/branches/rejuvenate01/main/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
    openoffice/branches/rejuvenate01/main/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
    openoffice/branches/rejuvenate01/main/svx/source/sidebar/paragraph/ParaPropertyPanel.src
    openoffice/branches/rejuvenate01/main/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
    openoffice/branches/rejuvenate01/main/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
    openoffice/branches/rejuvenate01/main/svx/source/sidebar/text/TextPropertyPanel.cxx
    openoffice/branches/rejuvenate01/main/svx/source/sidebar/text/TextPropertyPanel.hrc
    openoffice/branches/rejuvenate01/main/svx/source/sidebar/text/TextPropertyPanel.hxx
    openoffice/branches/rejuvenate01/main/svx/source/sidebar/text/TextPropertyPanel.src
    openoffice/branches/rejuvenate01/main/svx/source/svdraw/svdedxv.cxx
    openoffice/branches/rejuvenate01/main/svx/source/svdraw/svdhdl.cxx
    openoffice/branches/rejuvenate01/main/svx/source/svdraw/svdmodel.cxx
    openoffice/branches/rejuvenate01/main/svx/source/svdraw/svdobj.cxx
    openoffice/branches/rejuvenate01/main/svx/source/svdraw/svdundo.cxx
    openoffice/branches/rejuvenate01/main/svx/source/svdraw/svdxcgv.cxx
    openoffice/branches/rejuvenate01/main/svx/source/unodraw/unoprov.cxx
    openoffice/branches/rejuvenate01/main/sw/inc/IDocumentUndoRedo.hxx
    openoffice/branches/rejuvenate01/main/sw/inc/unotxdoc.hxx
    openoffice/branches/rejuvenate01/main/sw/source/core/bastyp/index.cxx
    openoffice/branches/rejuvenate01/main/sw/source/core/docnode/nodes.cxx
    openoffice/branches/rejuvenate01/main/sw/source/core/draw/dcontact.cxx
    openoffice/branches/rejuvenate01/main/sw/source/core/edit/eddel.cxx
    openoffice/branches/rejuvenate01/main/sw/source/core/edit/edundo.cxx
    openoffice/branches/rejuvenate01/main/sw/source/core/inc/UndoManager.hxx
    openoffice/branches/rejuvenate01/main/sw/source/core/layout/trvlfrm.cxx
    openoffice/branches/rejuvenate01/main/sw/source/core/undo/docundo.cxx
    openoffice/branches/rejuvenate01/main/sw/source/filter/ww8/rtfattributeoutput.cxx
    openoffice/branches/rejuvenate01/main/sw/source/filter/ww8/rtfattributeoutput.hxx
    openoffice/branches/rejuvenate01/main/sw/source/filter/ww8/rtfexport.cxx
    openoffice/branches/rejuvenate01/main/sw/source/filter/ww8/wrtw8nds.cxx
    openoffice/branches/rejuvenate01/main/sw/source/filter/ww8/ww8par.cxx
    openoffice/branches/rejuvenate01/main/sw/source/filter/ww8/ww8par6.cxx
    openoffice/branches/rejuvenate01/main/sw/source/filter/ww8/ww8scan.cxx
    openoffice/branches/rejuvenate01/main/sw/source/filter/ww8/ww8scan.hxx
    openoffice/branches/rejuvenate01/main/sw/source/ui/app/docsh.cxx
    openoffice/branches/rejuvenate01/main/sw/source/ui/docvw/edtwin.cxx
    openoffice/branches/rejuvenate01/main/sw/source/ui/misc/redlndlg.cxx
    openoffice/branches/rejuvenate01/main/sw/source/ui/shells/textfld.cxx
    openoffice/branches/rejuvenate01/main/sw/source/ui/shells/textsh1.cxx
    openoffice/branches/rejuvenate01/main/sw/source/ui/sidebar/PagePropertyPanel.cxx
    openoffice/branches/rejuvenate01/main/sw/source/ui/sidebar/PagePropertyPanel.hxx
    openoffice/branches/rejuvenate01/main/sw/source/ui/uno/unotxdoc.cxx
    openoffice/branches/rejuvenate01/main/sw/source/ui/wrtsh/delete.cxx
    openoffice/branches/rejuvenate01/main/sw/source/ui/wrtsh/wrtsh4.cxx
    openoffice/branches/rejuvenate01/main/sysui/desktop/debian/control
    openoffice/branches/rejuvenate01/main/sysui/desktop/icons/hicolor/128x128/apps/main.png
    openoffice/branches/rejuvenate01/main/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png
    openoffice/branches/rejuvenate01/main/sysui/desktop/icons/hicolor/16x16/apps/main.png
    openoffice/branches/rejuvenate01/main/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png
    openoffice/branches/rejuvenate01/main/sysui/desktop/icons/hicolor/32x32/apps/main.png
    openoffice/branches/rejuvenate01/main/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png
    openoffice/branches/rejuvenate01/main/sysui/desktop/icons/hicolor/48x48/apps/main.png
    openoffice/branches/rejuvenate01/main/sysui/desktop/icons/hicolor/48x48/apps/printeradmin.png
    openoffice/branches/rejuvenate01/main/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png
    openoffice/branches/rejuvenate01/main/sysui/desktop/icons/main.icns
    openoffice/branches/rejuvenate01/main/sysui/desktop/icons/ooo3_main_app.ico
    openoffice/branches/rejuvenate01/main/sysui/desktop/icons/ooo3_open.ico
    openoffice/branches/rejuvenate01/main/tools/Executable_mkunroll.mk
    openoffice/branches/rejuvenate01/main/tools/Executable_rscdep.mk
    openoffice/branches/rejuvenate01/main/tools/Executable_so_checksum.mk
    openoffice/branches/rejuvenate01/main/tools/Executable_sspretty.mk
    openoffice/branches/rejuvenate01/main/tools/StaticLibrary_ooopathutils.mk
    openoffice/branches/rejuvenate01/main/ucb/source/ucp/ftp/ftpcfunc.cxx
    openoffice/branches/rejuvenate01/main/ucb/source/ucp/ftp/ftpcfunc.hxx
    openoffice/branches/rejuvenate01/main/ucb/source/ucp/ftp/ftpinpstr.cxx
    openoffice/branches/rejuvenate01/main/ucb/source/ucp/ftp/ftpinpstr.hxx
    openoffice/branches/rejuvenate01/main/ucb/source/ucp/ftp/ftpurl.cxx
    openoffice/branches/rejuvenate01/main/ucb/source/ucp/ftp/ftpurl.hxx
    openoffice/branches/rejuvenate01/main/uui/source/fltdlg.src
    openoffice/branches/rejuvenate01/main/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
    openoffice/branches/rejuvenate01/main/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
    openoffice/branches/rejuvenate01/main/vcl/aqua/source/dtrans/OSXTransferable.cxx
    openoffice/branches/rejuvenate01/main/vcl/aqua/source/dtrans/aqua_clipboard.cxx
    openoffice/branches/rejuvenate01/main/vcl/aqua/source/window/salframeview.mm
    openoffice/branches/rejuvenate01/main/vcl/inc/vcl/bitmap.hxx
    openoffice/branches/rejuvenate01/main/vcl/inc/vcl/bitmapex.hxx
    openoffice/branches/rejuvenate01/main/vcl/source/control/ilstbox.cxx
    openoffice/branches/rejuvenate01/main/vcl/source/gdi/base14.cxx
    openoffice/branches/rejuvenate01/main/vcl/source/gdi/bitmap4.cxx
    openoffice/branches/rejuvenate01/main/vcl/source/gdi/bitmapex.cxx
    openoffice/branches/rejuvenate01/main/vcl/source/gdi/outdev2.cxx
    openoffice/branches/rejuvenate01/main/vcl/source/gdi/sallayout.cxx
    openoffice/branches/rejuvenate01/main/vcl/unx/generic/gdi/salgdi.cxx
    openoffice/branches/rejuvenate01/main/vcl/unx/gtk/window/gtkframe.cxx
    openoffice/branches/rejuvenate01/main/wizards/com/sun/star/wizards/common/NumberFormatter.java
    openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
    openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
    openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
    openoffice/branches/rejuvenate01/main/xmlsecurity/source/dialogs/warnings.src
    openoffice/branches/rejuvenate01/test/   (props changed)
    openoffice/branches/rejuvenate01/test/testcommon/source/org/openoffice/test/vcl/   (props changed)
    openoffice/branches/rejuvenate01/test/testuno/.classpath_linux
    openoffice/branches/rejuvenate01/test/testuno/.classpath_win

Modified: openoffice/branches/rejuvenate01/ext_libraries/apr-util/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/ext_libraries/apr-util/makefile.mk?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/ext_libraries/apr-util/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/ext_libraries/apr-util/makefile.mk Fri Jul 19 15:59:04 2013
@@ -83,13 +83,17 @@ CONFIGURE_FLAGS=								\
 	--with-iconv="no"				
 
 
-# Use our own expat on the Mac.  Maybe we should do this on Linux, too?
-.IF "$(OS)" == "MACOSX"
+# Use our own expat on the Mac.  Maybe we should do this on Linux, too? Yes!
+.IF "$(OS)" == "MACOSX" || ("$(OS)" == "LINUX" && "$(SYSTEM_EXPAT)"!="YES")
+
+expat_CPPFLAGS=-I$(SOLARINCDIR)$/external
+expat_LDFLAGS+=-L$(SOLARLIBDIR)
+CONFIGURE_FLAGS+= SOLARINCDIR=$(SOLARINCDIR) SOLARLIBDIR=$(SOLARLIBDIR) \
+	CPPFLAGS=$(expat_CPPFLAGS) LDFLAGS=$(expat_LDFLAGS)
 
-CONFIGURE_FLAGS+= --with-expat=$(OUTDIR)
 # The non-standard names of our expat libraries (yes, plural) make 
 # a special handling in apr-utils configure necessary.
-PATCH_FILES+= $(TARFILE_NAME).mac.expat.patch
+PATCH_FILES+= $(TARFILE_NAME).expat.patch
 
 .ENDIF
 

Modified: openoffice/branches/rejuvenate01/ext_libraries/coinmp/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/ext_libraries/coinmp/makefile.mk?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/ext_libraries/coinmp/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/ext_libraries/coinmp/makefile.mk Fri Jul 19 15:59:04 2013
@@ -48,7 +48,7 @@ TARFILE_MD5=2b5f1ca58d6ef30f18f1415b65be
 PATCH_FILES=coinmp-1.6.0.patch coinmp-1.6.0-clang.patch
 
 .IF "$(COM)"=="MSC"
-BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe CoinMP\\MSVisualStudio\\v9\\CoinMP.sln "Release|Win32"
+BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe -useenv CoinMP\\MSVisualStudio\\v9\\CoinMP.sln "Release|Win32"
 .ELSE
 CONFIGURE_ACTION=./configure
 #CONFIGURE_FLAGS=--disable-pkg-config --disable-bzlib --disable-zlib CC='$(CC) $(ARCH_FLAGS)' CXX='$(CXX) $(ARCH_FLAGS)' CFLAGS='$(ARCH_FLAGS) -Wc,-arch -Wc,i386' CPPFLAGS='$(ARCH_FLAGS)' LDFLAGS='$(ARCH_FLAGS)' compiler_flags='$(ARCH_FLAGS)'

Modified: openoffice/branches/rejuvenate01/ext_libraries/serf/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/ext_libraries/serf/makefile.mk?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/ext_libraries/serf/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/ext_libraries/serf/makefile.mk Fri Jul 19 15:59:04 2013
@@ -44,7 +44,7 @@ LIBSERFVERSION=$(SERF_MAJOR).$(SERF_MINO
 TARFILE_NAME=$(PRJNAME)-$(LIBSERFVERSION)
 # This is the SHA1 checksum, not MD5 but tg_ext.mk does not now about this and,
 # thankfully, does not care.
-TARFILE_MD5=30b29bd9214d50887abcc20cf82096aaaf5d1d61
+TARFILE_MD5=f65fbbd72926c8e7cf0dbd4ada03b0d226f461fd
 
 PATCH_FILES=
 

Modified: openoffice/branches/rejuvenate01/ext_libraries/serf/serf_version.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/ext_libraries/serf/serf_version.mk?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/ext_libraries/serf/serf_version.mk (original)
+++ openoffice/branches/rejuvenate01/ext_libraries/serf/serf_version.mk Fri Jul 19 15:59:04 2013
@@ -21,4 +21,4 @@
 
 SERF_MAJOR=1
 SERF_MINOR=2
-SERF_MICRO=0
+SERF_MICRO=1

Modified: openoffice/branches/rejuvenate01/ext_libraries/serf/win/Library_serf.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/ext_libraries/serf/win/Library_serf.mk?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/ext_libraries/serf/win/Library_serf.mk (original)
+++ openoffice/branches/rejuvenate01/ext_libraries/serf/win/Library_serf.mk Fri Jul 19 15:59:04 2013
@@ -59,33 +59,33 @@ $(eval $(call gb_Library_add_linked_libs
 ))
 
 $(eval $(call gb_Library_add_cobjects,serf,\
-	serf/$(INPATH)/misc/build/serf-1.2.0/auth/auth \
-	serf/$(INPATH)/misc/build/serf-1.2.0/auth/auth_basic \
-	serf/$(INPATH)/misc/build/serf-1.2.0/auth/auth_digest \
-	serf/$(INPATH)/misc/build/serf-1.2.0/auth/auth_kerb \
-	serf/$(INPATH)/misc/build/serf-1.2.0/auth/auth_kerb_gss \
-	serf/$(INPATH)/misc/build/serf-1.2.0/auth/auth_kerb_sspi \
-	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/aggregate_buckets \
-	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/allocator \
-	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/barrier_buckets \
-	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/buckets \
-	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/bwtp_buckets \
-	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/chunk_buckets \
-	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/dechunk_buckets \
-	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/deflate_buckets \
-	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/file_buckets \
-	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/headers_buckets \
-	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/iovec_buckets \
-	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/limit_buckets \
-	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/mmap_buckets \
-	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/request_buckets \
-	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/response_body_buckets \
-	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/response_buckets \
-	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/simple_buckets \
-	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/socket_buckets \
-	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/ssl_buckets \
-	serf/$(INPATH)/misc/build/serf-1.2.0/context \
-	serf/$(INPATH)/misc/build/serf-1.2.0/incoming \
-	serf/$(INPATH)/misc/build/serf-1.2.0/outgoing \
-	serf/$(INPATH)/misc/build/serf-1.2.0/ssltunnel \
+	serf/$(INPATH)/misc/build/serf-1.2.1/auth/auth \
+	serf/$(INPATH)/misc/build/serf-1.2.1/auth/auth_basic \
+	serf/$(INPATH)/misc/build/serf-1.2.1/auth/auth_digest \
+	serf/$(INPATH)/misc/build/serf-1.2.1/auth/auth_kerb \
+	serf/$(INPATH)/misc/build/serf-1.2.1/auth/auth_kerb_gss \
+	serf/$(INPATH)/misc/build/serf-1.2.1/auth/auth_kerb_sspi \
+	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/aggregate_buckets \
+	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/allocator \
+	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/barrier_buckets \
+	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/buckets \
+	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/bwtp_buckets \
+	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/chunk_buckets \
+	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/dechunk_buckets \
+	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/deflate_buckets \
+	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/file_buckets \
+	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/headers_buckets \
+	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/iovec_buckets \
+	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/limit_buckets \
+	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/mmap_buckets \
+	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/request_buckets \
+	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/response_body_buckets \
+	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/response_buckets \
+	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/simple_buckets \
+	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/socket_buckets \
+	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/ssl_buckets \
+	serf/$(INPATH)/misc/build/serf-1.2.1/context \
+	serf/$(INPATH)/misc/build/serf-1.2.1/incoming \
+	serf/$(INPATH)/misc/build/serf-1.2.1/outgoing \
+	serf/$(INPATH)/misc/build/serf-1.2.1/ssltunnel \
 ))

Modified: openoffice/branches/rejuvenate01/ext_libraries/serf/win/Package_inc.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/ext_libraries/serf/win/Package_inc.mk?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/ext_libraries/serf/win/Package_inc.mk (original)
+++ openoffice/branches/rejuvenate01/ext_libraries/serf/win/Package_inc.mk Fri Jul 19 15:59:04 2013
@@ -19,7 +19,7 @@
 # * 
 # *************************************************************/
 
-$(eval $(call gb_Package_Package,serf_inc,$(EXT_LIBRARIES)/serf/$(INPATH)/misc/build/serf-1.2.0))
+$(eval $(call gb_Package_Package,serf_inc,$(EXT_LIBRARIES)/serf/$(INPATH)/misc/build/serf-1.2.1))
 $(eval $(call gb_Package_add_files, serf_inc, inc/serf,        \
        serf.h                                                  \
        serf_bucket_types.h                                     \

Modified: openoffice/branches/rejuvenate01/main/LICENSE
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/LICENSE?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/LICENSE (original)
+++ openoffice/branches/rejuvenate01/main/LICENSE Fri Jul 19 15:59:04 2013
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2012 Apache Software Foundation
+   Copyright 2012, 2013 Apache Software Foundation
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

Modified: openoffice/branches/rejuvenate01/main/LICENSE_ALv2
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/LICENSE_ALv2?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/LICENSE_ALv2 (original)
+++ openoffice/branches/rejuvenate01/main/LICENSE_ALv2 Fri Jul 19 15:59:04 2013
@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2011, 2012 Apache Software Foundation
+   Copyright 2011, 2012, 2013 Apache Software Foundation
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

Modified: openoffice/branches/rejuvenate01/main/NOTICE
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/NOTICE?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/NOTICE (original)
+++ openoffice/branches/rejuvenate01/main/NOTICE Fri Jul 19 15:59:04 2013
@@ -1,4 +1,4 @@
-Apache OpenOffice
+Apache OpenOffice (http://www.openoffice.org)
 Copyright 2011, 2013 The Apache Software Foundation
 
 This product includes software developed at
@@ -9,6 +9,8 @@ ____
 
 Portions of this software copyright (c) 2000-2011, Oracle and/or its affiliates  <http://www.oracle.com/>.
 
+Portions of this software (C) Copyright IBM Corporation 2003, 2012.  All Rights Reserved.
+
 ____
 
 As part of the base system this product also includes code from the following

Modified: openoffice/branches/rejuvenate01/main/RepositoryFixes.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/RepositoryFixes.mk?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/RepositoryFixes.mk (original)
+++ openoffice/branches/rejuvenate01/main/RepositoryFixes.mk Fri Jul 19 15:59:04 2013
@@ -76,12 +76,8 @@ gb_Library_FILENAMES := $(patsubst rdf:i
 gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
 
 ifeq ($(USE_SYSTEM_STL),YES)
-ifeq ($(gb_PRODUCT),$(true))
 gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprt%,$(gb_Library_FILENAMES))
 else
-gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprtd%,$(gb_Library_FILENAMES))
-endif
-else
 ifeq ($(gb_PRODUCT),$(true))
 gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71%,$(gb_Library_FILENAMES))
 else
@@ -136,12 +132,8 @@ gb_Library_FILENAMES := $(patsubst z:iz%
 gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES))
 
 ifeq ($(USE_SYSTEM_STL),YES)
-ifeq ($(gb_PRODUCT),$(true))
 gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprt%,$(gb_Library_FILENAMES))
 else
-gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprtd%,$(gb_Library_FILENAMES))
-endif
-else
 ifeq ($(gb_PRODUCT),$(true))
 gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71%,$(gb_Library_FILENAMES))
 else
@@ -173,9 +165,9 @@ gb_Library_NOILIBFILENAMES:=\
 
 gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES))
 gb_Library_FILENAMES += $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT))
-ifneq ($(gb_PRODUCT),$(true))
-gb_Library_FILENAMES := $(patsubst msvcrt:msvcrt%,msvcrt:msvcrtd%,$(gb_Library_FILENAMES))
-endif
+#ifneq ($(gb_PRODUCT),$(true))
+#gb_Library_FILENAMES := $(patsubst msvcrt:msvcrt%,msvcrt:msvcrtd%,$(gb_Library_FILENAMES))
+#endif
 
 gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_DLLFILENAMES))

Modified: openoffice/branches/rejuvenate01/main/accessibility/bridge/org/openoffice/java/accessibility/ComboBox.java
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/accessibility/bridge/org/openoffice/java/accessibility/ComboBox.java?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/accessibility/bridge/org/openoffice/java/accessibility/ComboBox.java (original)
+++ openoffice/branches/rejuvenate01/main/accessibility/bridge/org/openoffice/java/accessibility/ComboBox.java Fri Jul 19 15:59:04 2013
@@ -110,4 +110,16 @@ public class ComboBox extends Container 
             return 1;
         }
     }
+
+    /**
+     * Returns whether this Component can be focused.
+     *
+     * @return <code>true</code> if this Component is focusable;
+     *         <code>false</code> otherwise.
+     * @see #setFocusable
+     * @since 1.4
+     */
+    public boolean isFocusable() {
+        return true;
+    }
 }

Modified: openoffice/branches/rejuvenate01/main/accessibility/bridge/org/openoffice/java/accessibility/Dialog.java
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/accessibility/bridge/org/openoffice/java/accessibility/Dialog.java?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/accessibility/bridge/org/openoffice/java/accessibility/Dialog.java (original)
+++ openoffice/branches/rejuvenate01/main/accessibility/bridge/org/openoffice/java/accessibility/Dialog.java Fri Jul 19 15:59:04 2013
@@ -118,18 +118,39 @@ public class Dialog extends java.awt.Dia
     public void removeNotify() {
     }
     
-        /**
-         * Determines if the object is visible.  Note: this means that the
-         * object intends to be visible; however, it may not in fact be
-         * showing on the screen because one of the objects that this object
-         * is contained by is not visible.  To determine if an object is
-         * showing on the screen, use <code>isShowing</code>.
-         *
-         * @return true if object is visible; otherwise, false
-         */
+    /**
+     * Determines if the object is visible.  Note: this means that the
+     * object intends to be visible; however, it may not in fact be
+     * showing on the screen because one of the objects that this object
+     * is contained by is not visible.  To determine if an object is
+     * showing on the screen, use <code>isShowing</code>.
+     *
+     * @return true if object is visible; otherwise, false
+     */
     public boolean isVisible(){
         return visible;
     }
+
+    /**
+     * Determines whether this component is displayable. A component is
+     * displayable when it is connected to a native screen resource.
+     * <p>
+     * A component is made displayable either when it is added to
+     * a displayable containment hierarchy or when its containment
+     * hierarchy is made displayable.
+     * A containment hierarchy is made displayable when its ancestor
+     * window is either packed or made visible.
+     * <p>
+     * A component is made undisplayable either when it is removed from
+     * a displayable containment hierarchy or when its containment hierarchy
+     * is made undisplayable.  A containment hierarchy is made
+     * undisplayable when its ancestor window is disposed.
+     *
+     * @return <code>true</code> if the component is displayable
+     */
+    public boolean isDisplayable() {
+        return true;
+    }
     
     /**
     * Shows or hides this component depending on the value of parameter

Modified: openoffice/branches/rejuvenate01/main/accessibility/bridge/org/openoffice/java/accessibility/Frame.java
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/accessibility/bridge/org/openoffice/java/accessibility/Frame.java?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/accessibility/bridge/org/openoffice/java/accessibility/Frame.java (original)
+++ openoffice/branches/rejuvenate01/main/accessibility/bridge/org/openoffice/java/accessibility/Frame.java Fri Jul 19 15:59:04 2013
@@ -638,5 +638,28 @@ public class Frame extends java.awt.Fram
             unoAccessibleComponent.grabFocus();
         }
     }
+
+    /**
+     * Determines whether this component is displayable. A component is
+     * displayable when it is connected to a native screen resource.
+     * <p>
+     * A component is made displayable either when it is added to
+     * a displayable containment hierarchy or when its containment
+     * hierarchy is made displayable.
+     * A containment hierarchy is made displayable when its ancestor
+     * window is either packed or made visible.
+     * <p>
+     * A component is made undisplayable either when it is removed from
+     * a displayable containment hierarchy or when its containment hierarchy
+     * is made undisplayable.  A containment hierarchy is made
+     * undisplayable when its ancestor window is disposed.
+     *
+     * @return <code>true</code> if the component is displayable
+     */
+    @Override
+    public boolean isDisplayable() {
+        return true;
+    }
+
 }
 

Modified: openoffice/branches/rejuvenate01/main/accessibility/bridge/org/openoffice/java/accessibility/Window.java
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/accessibility/bridge/org/openoffice/java/accessibility/Window.java?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/accessibility/bridge/org/openoffice/java/accessibility/Window.java (original)
+++ openoffice/branches/rejuvenate01/main/accessibility/bridge/org/openoffice/java/accessibility/Window.java Fri Jul 19 15:59:04 2013
@@ -543,5 +543,28 @@ public class Window extends java.awt.Win
             unoAccessibleComponent.grabFocus();
         }
     }
+
+    /**
+     * Determines whether this component is displayable. A component is
+     * displayable when it is connected to a native screen resource.
+     * <p>
+     * A component is made displayable either when it is added to
+     * a displayable containment hierarchy or when its containment
+     * hierarchy is made displayable.
+     * A containment hierarchy is made displayable when its ancestor
+     * window is either packed or made visible.
+     * <p>
+     * A component is made undisplayable either when it is removed from
+     * a displayable containment hierarchy or when its containment hierarchy
+     * is made undisplayable.  A containment hierarchy is made
+     * undisplayable when its ancestor window is disposed.
+     *
+     * @return <code>true</code> if the component is displayable
+     */
+    @Override
+    public boolean isDisplayable() {
+        return true;
+    }
+
 }
 

Modified: openoffice/branches/rejuvenate01/main/basctl/source/basicide/baside2b.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/basctl/source/basicide/baside2b.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/basctl/source/basicide/baside2b.cxx (original)
+++ openoffice/branches/rejuvenate01/main/basctl/source/basicide/baside2b.cxx Fri Jul 19 15:59:04 2013
@@ -383,7 +383,15 @@ void __EXPORT EditorWindow::Command( con
 			 ( rCEvt.GetCommand() == COMMAND_AUTOSCROLL ) )
 		{
 			HandleScrollCommand( rCEvt, pModulWindow->GetHScrollBar(), &pModulWindow->GetEditVScrollBar() );
-		}
+		} else if ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU ) {
+            BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+            SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
+            SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
+            if ( pDispatcher )
+            {
+                pDispatcher->ExecutePopup();
+            }
+        }
 	}
 }
 

Modified: openoffice/branches/rejuvenate01/main/basegfx/source/vector/b2dvector.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/basegfx/source/vector/b2dvector.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/basegfx/source/vector/b2dvector.cxx (original)
+++ openoffice/branches/rejuvenate01/main/basegfx/source/vector/b2dvector.cxx Fri Jul 19 15:59:04 2013
@@ -118,7 +118,7 @@ namespace basegfx
 
 		if(!fTools::equalZero(fLenNow))
 		{
-			const double fOne(10.0);
+			const double fOne(1.0);
 
 			if(!fTools::equal(fOne, fLenNow))
 			{

Modified: openoffice/branches/rejuvenate01/main/boost/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/boost/makefile.mk?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/boost/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/boost/makefile.mk Fri Jul 19 15:59:04 2013
@@ -49,6 +49,9 @@ TARFILE_MD5=d1e9a7a7f532bb031a3c175d8668
 PATCH_FILES=\
 	$(TARFILE_NAME).patch \
 	boost_freebsd.patch
+.IF "$(GUI)"=="OS2"
+PATCH_FILES+=boost-os2.patch
+.ENDIF
 
 CONFIGURE_DIR=
 CONFIGURE_ACTION=

Modified: openoffice/branches/rejuvenate01/main/canvas/source/vcl/canvascustomsprite.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/canvas/source/vcl/canvascustomsprite.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/canvas/source/vcl/canvascustomsprite.cxx (original)
+++ openoffice/branches/rejuvenate01/main/canvas/source/vcl/canvascustomsprite.cxx Fri Jul 19 15:59:04 2013
@@ -80,9 +80,8 @@ namespace vclcanvas
         BackBufferSharedPtr pBackBuffer( new BackBuffer( rOutDevProvider->getOutDev() ) );
         pBackBuffer->setSize( aSize );
 
-        // create mask backbuffer, with one bit color depth
-        BackBufferSharedPtr pBackBufferMask( new BackBuffer( rOutDevProvider->getOutDev(), 
-                                                             true ) );
+        // create mask backbuffer, with one bit color depth #122485# use full depth to avoid problem with 1bit depth, get AAed masks
+        BackBufferSharedPtr pBackBufferMask( new BackBuffer( rOutDevProvider->getOutDev() ) ); // , true ) ); // #122485#
         pBackBufferMask->setSize( aSize );
 
         // TODO(F1): Implement alpha vdev (could prolly enable

Modified: openoffice/branches/rejuvenate01/main/chart2/source/inc/InternalDataProvider.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/chart2/source/inc/InternalDataProvider.hxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/chart2/source/inc/InternalDataProvider.hxx (original)
+++ openoffice/branches/rejuvenate01/main/chart2/source/inc/InternalDataProvider.hxx Fri Jul 19 15:59:04 2013
@@ -75,8 +75,13 @@ class InternalDataProvider :
 {
 public:
     explicit InternalDataProvider(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & _xContext);
-    explicit InternalDataProvider( const ::com::sun::star::uno::Reference<
-                                       ::com::sun::star::chart2::XChartDocument > & xChartDoc, bool bConnectToModel );
+    
+    // #120559# allow handing over a default for data orientation (DataInColumns) that will
+    // be used when no data is available
+    explicit InternalDataProvider( 
+        const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > & xChartDoc, 
+        bool bConnectToModel, 
+        bool bDefaultDataInColumns );
     explicit InternalDataProvider( const InternalDataProvider & rOther );
 	virtual ~InternalDataProvider();
 

Modified: openoffice/branches/rejuvenate01/main/chart2/source/tools/ChartModelHelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/chart2/source/tools/ChartModelHelper.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/chart2/source/tools/ChartModelHelper.cxx (original)
+++ openoffice/branches/rejuvenate01/main/chart2/source/tools/ChartModelHelper.cxx Fri Jul 19 15:59:04 2013
@@ -43,6 +43,9 @@
 // header for define DBG_ASSERT
 #include <tools/debug.hxx>
 
+#include <com/sun/star/chart/XChartDocument.hpp>
+#include <com/sun/star/chart/ChartDataRowSource.hpp>
+
 //.............................................................................
 namespace chart
 {
@@ -59,7 +62,35 @@ uno::Reference< chart2::data::XRangeHigh
 uno::Reference< chart2::data::XDataProvider > ChartModelHelper::createInternalDataProvider(
     const uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDoc, bool bConnectToModel )
 {
-    return new InternalDataProvider( xChartDoc, bConnectToModel );
+    bool bDefaultDataInColumns(true);
+
+    // #120559# Try to access the current state of "DataRowSource" fo rthe chart data and
+    // use it as default for creating a new InternalDataProvider
+    if(xChartDoc.is())
+    {
+        ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDocument > xDoc(xChartDoc, uno::UNO_QUERY);
+
+        if(xDoc.is())
+        {
+            ::com::sun::star::uno::Reference< ::com::sun::star::chart::XDiagram > aDiagram = xDoc->getDiagram();
+
+            if(aDiagram.is())
+            {
+                ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xProp(aDiagram, uno::UNO_QUERY);
+
+                if(xProp.is())
+                {
+                    ::com::sun::star::chart::ChartDataRowSource aDataRowSource(::com::sun::star::chart::ChartDataRowSource_COLUMNS);
+
+                    xProp->getPropertyValue( ::rtl::OUString::createFromAscii("DataRowSource")) >>= aDataRowSource;
+
+                    bDefaultDataInColumns = (::com::sun::star::chart::ChartDataRowSource_COLUMNS == aDataRowSource);
+                }
+            }
+        }
+    }
+
+    return new InternalDataProvider( xChartDoc, bConnectToModel, bDefaultDataInColumns );
 }
 
 uno::Reference< XDiagram > ChartModelHelper::findDiagram( const uno::Reference< frame::XModel >& xModel )

Modified: openoffice/branches/rejuvenate01/main/chart2/source/tools/ExplicitCategoriesProvider.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/chart2/source/tools/ExplicitCategoriesProvider.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/chart2/source/tools/ExplicitCategoriesProvider.cxx (original)
+++ openoffice/branches/rejuvenate01/main/chart2/source/tools/ExplicitCategoriesProvider.cxx Fri Jul 19 15:59:04 2013
@@ -358,8 +358,11 @@ Sequence< OUString > lcl_getExplicitSimp
             sal_Int32 nCurrentCount = lcl_getCategoryCount( *aOuterIt );
             if( nCurrentCount< nMaxCategoryCount )
             {
-                ComplexCategory& rComplexCategory = aOuterIt->back();
-                rComplexCategory.Count += (nMaxCategoryCount-nCurrentCount);
+                if(!aOuterIt->empty()) // #121277# Caution, aOuterIt may be empty (!)
+                {
+                    ComplexCategory& rComplexCategory = aOuterIt->back();
+                    rComplexCategory.Count += (nMaxCategoryCount-nCurrentCount);
+                }
             }
         }
     }
@@ -391,12 +394,17 @@ Sequence< OUString > lcl_getExplicitSimp
             OUString aText;
             for( aOuterIt=aComplexCatsPerIndex.begin() ; aOuterIt != aOuterEnd; ++aOuterIt )
             {
-                OUString aAddText = (*aOuterIt)[nN].Text;
-                if( aAddText.getLength() )
+                OUString aAddText;
+
+                if(!aOuterIt->empty()) // #121277# Caution, aOuterIt may be empty (!)
                 {
-                    if(aText.getLength())
-                        aText += aSpace;
-                    aText += aAddText;
+                    aAddText = (*aOuterIt)[nN].Text;
+                    if( aAddText.getLength() )
+                    {
+                        if(aText.getLength())
+                            aText += aSpace;
+                        aText += aAddText;
+                    }
                 }
             }
             aRet[nN]=aText;

Modified: openoffice/branches/rejuvenate01/main/chart2/source/tools/InternalDataProvider.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/chart2/source/tools/InternalDataProvider.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/chart2/source/tools/InternalDataProvider.cxx (original)
+++ openoffice/branches/rejuvenate01/main/chart2/source/tools/InternalDataProvider.cxx Fri Jul 19 15:59:04 2013
@@ -337,8 +337,11 @@ InternalDataProvider::InternalDataProvid
     : m_bDataInColumns( true )
 {}
 
-InternalDataProvider::InternalDataProvider( const Reference< chart2::XChartDocument > & xChartDoc, bool bConnectToModel )
-    : m_bDataInColumns( true )
+InternalDataProvider::InternalDataProvider( 
+    const Reference< chart2::XChartDocument > & xChartDoc, 
+    bool bConnectToModel,
+    bool bDefaultDataInColumns)
+:   m_bDataInColumns( bDefaultDataInColumns )
 {
     try
     {
@@ -353,7 +356,15 @@ InternalDataProvider::InternalDataProvid
                 bool bFirstCellAsLabel = true;
                 bool bHasCategories = true;
                 uno::Sequence< sal_Int32 > aSequenceMapping;
-                DataSourceHelper::detectRangeSegmentation( xChartModel, aRangeString, aSequenceMapping, m_bDataInColumns, bFirstCellAsLabel, bHasCategories );
+                const bool bSomethingDetected(
+                    DataSourceHelper::detectRangeSegmentation( 
+                        xChartModel, aRangeString, aSequenceMapping, m_bDataInColumns, bFirstCellAsLabel, bHasCategories ));
+
+                // #120559# if no data was available, restore default
+                if(!bSomethingDetected && m_bDataInColumns != bDefaultDataInColumns)
+                {
+                    m_bDataInColumns = bDefaultDataInColumns;
+                }
             }
 
             // categories

Modified: openoffice/branches/rejuvenate01/main/cli_ure/source/native/native_bootstrap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/cli_ure/source/native/native_bootstrap.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/cli_ure/source/native/native_bootstrap.cxx (original)
+++ openoffice/branches/rejuvenate01/main/cli_ure/source/native/native_bootstrap.cxx Fri Jul 19 15:59:04 2013
@@ -55,6 +55,7 @@ namespace cli_ure {
 // INSTALL_PATH value needs to correspond to the Windows registry subkey
 // in main\scp2\source\ooo\registryitem_ooo.scp
 #define INSTALL_PATH L"Software\\OpenOffice\\UNO\\InstallPath"
+#define INSTALL_PATH_64 L"Software\\Wow6432Node\\OpenOffice\\UNO\\InstallPath"
 #define BASIS_LINK L"\\basis-link"
 #define URE_LINK L"\\ure-link"
 #define URE_BIN L"\\bin"
@@ -156,9 +157,19 @@ WCHAR * getInstallPath()
         szInstallPath = getPathFromRegistryKey( HKEY_CURRENT_USER, INSTALL_PATH );
         if ( szInstallPath == NULL )
         {
+            /* read the key's default value from HKEY_LOCAL_USER */
+            szInstallPath = getPathFromRegistryKey( HKEY_LOCAL_MACHINE, INSTALL_PATH_64 );
+        }
+        else if ( szInstallPath == NULL )
+        {
             /* read the key's default value from HKEY_LOCAL_MACHINE */
             szInstallPath = getPathFromRegistryKey( HKEY_LOCAL_MACHINE, INSTALL_PATH );
         }
+        else if ( szInstallPath == NULL )
+        {
+            /* read the key's default value from HKEY_LOCAL_MACHINE */
+            szInstallPath = getPathFromRegistryKey( HKEY_LOCAL_MACHINE, INSTALL_PATH_64 );
+        }
     }
     return szInstallPath;
 }
@@ -269,7 +280,8 @@ HMODULE loadFromPath(LPCWSTR sLibName)
 	if (sLibName == NULL)
 		return NULL;
 
-	WCHAR * szUreBinPath =  getUnoPath();
+//	WCHAR * szUreBinPath =  getUnoPath();
+	WCHAR * szUreBinPath =  getInstallPath();
 	if (!szUreBinPath)
 		return NULL;
 

Modified: openoffice/branches/rejuvenate01/main/configmgr/source/partial.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/configmgr/source/partial.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/configmgr/source/partial.cxx (original)
+++ openoffice/branches/rejuvenate01/main/configmgr/source/partial.cxx Fri Jul 19 15:59:04 2013
@@ -119,15 +119,17 @@ Partial::Containment Partial::contains(P
     bool includes = false;
     for (Path::const_iterator i(path.begin()); i != path.end(); ++i) {
         Node::Children::const_iterator j(p->children.find(*i));
-        if (j == p->children.end()) {
+        if ( j == p->children.end() )
+        {
             break;
         }
         p = &j->second;
         includes |= p->startInclude;
     }
-    return p->children.empty() && !p->startInclude
-        ? CONTAINS_NOT
-        : includes ? CONTAINS_NODE : CONTAINS_SUBNODES;
+    return ( ( p->children.empty() || p == &root_ )
+             && !p->startInclude )
+           ? CONTAINS_NOT
+           : ( includes ? CONTAINS_NODE : CONTAINS_SUBNODES );
 }
 
 }

Modified: openoffice/branches/rejuvenate01/main/configure.in
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/configure.in?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/configure.in (original)
+++ openoffice/branches/rejuvenate01/main/configure.in Fri Jul 19 15:59:04 2013
@@ -1866,7 +1866,7 @@ if test "$DMAKE" = "no"; then
        AC_MSG_RESULT([dmake will be downloaded and compiled in bootstrap])
        DMAKE=
     else
-       AC_MSG_ERROR([no URL for dmake source code specified, either.])
+       AC_MSG_ERROR([no URL for dmake source code specified, either. Use --with-dmake-url to supply an URL; run configure with the --help option for a list of possible URLs.])
        BUILD_DMAKE=YES
     fi
 else
@@ -3534,7 +3534,7 @@ if test "$enable_epm" = "yes"; then
          BUILD_TYPE="$BUILD_TYPE EPM"
       else
          if test "$EPM" = "no" ; then
-	    AC_MSG_ERROR([no. Install ESP Package Manager (http://www.msweet.org/projects.php?Z2) and/or specify the path to the right epm (--with-epm). Or specify an Url to an epm-3.7 source package (--with-epm-url)])
+	    AC_MSG_ERROR([no. Install ESP Package Manager (http://www.msweet.org/projects.php?Z2) and/or specify the path to the right epm (--with-epm). Or specify an URL to an epm-3.7 source package (--with-epm-url); run configure with the --help option for a list of possible URLs.])
 	 else
 	    # Gentoo has some epm which is something different...
             AC_MSG_CHECKING([whether the found epm is the right epm])
@@ -3791,7 +3791,8 @@ if test "z$enable_odk" = "z" -o "$enable
          AC_MSG_ERROR([for rebuilding unowinreg.dll you need the mingw32 C++ compiler.
          Specify mingw32 g++ executable name with --with-mingwin.
          Or use prebuilt one from http://tools.openoffice.org/unowinreg_prebuild/680/ and
-         put it into external/unowinreg])
+         put it into external/unowinreg using your browser or a command equivalent to:
+         wget -O external/unowinreg/unowinreg.dll http://www.openoffice.org/tools/unowinreg_prebuild/680/unowinreg.dll])
       fi
       if echo "$WITH_MINGWIN" | $EGREP -q "/"; then
          if ! test -x "$WITH_MINGWIN"; then MINGWCXX=false; else MINGWCXX=`basename $WITH_MINGWIN`; fi
@@ -5667,6 +5668,9 @@ dnl Check if this is the right SDK.
     elif echo $PSDK_HOME | grep "v6.0" >/dev/null 2>/dev/null; then
         AC_MSG_RESULT([Found Windows SDK 6.0 ($PSDK_HOME)])
         WINDOWS_VISTA_PSDK=TRUE
+    elif echo $PSDK_HOME | grep "v7.0" >/dev/null 2>/dev/null; then
+        AC_MSG_RESULT([Found Windows SDK 7.0 ($PSDK_HOME)])
+        WINDOWS_VISTA_PSDK=TRUE
     else
         AC_MSG_RESULT([Found Legacy Windows Platform SDK ($PSDK_HOME)])
     fi

Modified: openoffice/branches/rejuvenate01/main/connectivity/source/resource/conn_shared_res.src
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/connectivity/source/resource/conn_shared_res.src?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/connectivity/source/resource/conn_shared_res.src (original)
+++ openoffice/branches/rejuvenate01/main/connectivity/source/resource/conn_shared_res.src Fri Jul 19 15:59:04 2013
@@ -396,7 +396,7 @@ String STR_COULD_NOT_CREATE_INDEX_NAME
 };
 String STR_COULD_NOT_CREATE_INDEX_KEYSIZE
 {
-    Text [ en-US ] = "The index could not be created. The size of the chosen column is to big.";
+    Text [ en-US ] = "The index could not be created. The size of the chosen column is too big.";
 };
 
 String STR_SQL_NAME_ERROR

Modified: openoffice/branches/rejuvenate01/main/cppcanvas/source/mtfrenderer/implrenderer.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/cppcanvas/source/mtfrenderer/implrenderer.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/cppcanvas/source/mtfrenderer/implrenderer.cxx (original)
+++ openoffice/branches/rejuvenate01/main/cppcanvas/source/mtfrenderer/implrenderer.cxx Fri Jul 19 15:59:04 2013
@@ -1496,6 +1496,13 @@ namespace cppcanvas
                                            getState( rStates ).lineColor,
                                            rCanvas );
                         }
+                        else
+                        {
+                            // #120994# Do switch on/off LineColor, even when a overriding one is set
+                            bool bSetting(static_cast<MetaLineColorAction*>(pCurrAct)->IsSetting());
+
+                            getState( rStates ).isLineColorSet = bSetting;
+                        }
                         break;
 
                     case META_FILLCOLOR_ACTION:
@@ -1506,6 +1513,13 @@ namespace cppcanvas
                                            getState( rStates ).fillColor,
                                            rCanvas );
                         }
+                        else
+                        {
+                            // #120994# Do switch on/off FillColor, even when a overriding one is set
+                            bool bSetting(static_cast<MetaFillColorAction*>(pCurrAct)->IsSetting());
+
+                            getState( rStates ).isFillColorSet = bSetting;
+                        }
                         break;
 
                     case META_TEXTCOLOR_ACTION:
@@ -1537,6 +1551,13 @@ namespace cppcanvas
                                            getState( rStates ).textFillColor,
                                            rCanvas );
                         }
+                        else
+                        {
+                            // #120994# Do switch on/off TextFillColor, even when a overriding one is set
+                            bool bSetting(static_cast<MetaTextFillColorAction*>(pCurrAct)->IsSetting());
+
+                            getState( rStates ).isTextFillColorSet = bSetting;
+                        }
                         break;
 
                     case META_TEXTLINECOLOR_ACTION:
@@ -1547,6 +1568,13 @@ namespace cppcanvas
                                            getState( rStates ).textLineColor,
                                            rCanvas );
                         }
+                        else
+                        {
+                            // #120994# Do switch on/off TextLineColor, even when a overriding one is set
+                            bool bSetting(static_cast<MetaTextLineColorAction*>(pCurrAct)->IsSetting());
+
+                            getState( rStates ).isTextLineColorSet = bSetting;
+                        }
                         break;
 
                     case META_TEXTALIGN_ACTION:

Modified: openoffice/branches/rejuvenate01/main/cppuhelper/source/findsofficepath.c
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/cppuhelper/source/findsofficepath.c?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/cppuhelper/source/findsofficepath.c (original)
+++ openoffice/branches/rejuvenate01/main/cppuhelper/source/findsofficepath.c Fri Jul 19 15:59:04 2013
@@ -87,6 +87,7 @@ static char* getPathFromRegistryKey( HKE
 static char* platformSpecific()
 {
     const char* SUBKEYNAME = "Software\\OpenOffice\\UNO\\InstallPath";
+    const char* SUBKEYNAME64 = "Software\\Wow6432Node\\OpenOffice\\UNO\\InstallPath";
 
     char* path = NULL;
     
@@ -95,9 +96,19 @@ static char* platformSpecific()
 
     if ( path == NULL )
     {
+        /* read the key's default value from HKEY_LOCAL_USER 64 */
+        path = getPathFromRegistryKey( HKEY_LOCAL_MACHINE, SUBKEYNAME64 );
+    }
+    else if ( path == NULL )
+    {
         /* read the key's default value from HKEY_LOCAL_MACHINE */
         path = getPathFromRegistryKey( HKEY_LOCAL_MACHINE, SUBKEYNAME );
     }
+    else if ( path == NULL )
+    {
+        /* read the key's default value from HKEY_LOCAL_MACHINE 64*/
+        path = getPathFromRegistryKey( HKEY_LOCAL_MACHINE, SUBKEYNAME64 );
+    }
 
     return path;
 }

Modified: openoffice/branches/rejuvenate01/main/cui/source/dialogs/cuifmsearch.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/cui/source/dialogs/cuifmsearch.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/cui/source/dialogs/cuifmsearch.cxx (original)
+++ openoffice/branches/rejuvenate01/main/cui/source/dialogs/cuifmsearch.cxx Fri Jul 19 15:59:04 2013
@@ -252,6 +252,7 @@ void FmSearchDialog::Init(const UniStrin
 
 	m_cmbSearchText.SetModifyHdl(LINK(this, FmSearchDialog, OnSearchTextModified));
 	m_cmbSearchText.EnableAutocomplete(sal_False);
+	m_cmbSearchText.SetGetFocusHdl(LINK(this, FmSearchDialog, OnFocusGrabbed));
 
 	m_cbUseFormat.SetToggleHdl(LINK(this, FmSearchDialog, OnCheckBoxToggled));
 	m_cbBackwards.SetToggleHdl(LINK(this, FmSearchDialog, OnCheckBoxToggled));
@@ -443,6 +444,13 @@ IMPL_LINK(FmSearchDialog, OnSearchTextMo
 }
 
 //------------------------------------------------------------------------
+IMPL_LINK(FmSearchDialog, OnFocusGrabbed, ComboBox*, EMPTYARG)
+{
+    m_cmbSearchText.SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
+    return 0;
+}
+
+//------------------------------------------------------------------------
 IMPL_LINK(FmSearchDialog, OnPositionSelected, ListBox*, pBox)
 {
     (void) pBox; // avoid warning

Modified: openoffice/branches/rejuvenate01/main/cui/source/inc/cuifmsearch.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/cui/source/inc/cuifmsearch.hxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/cui/source/inc/cuifmsearch.hxx (original)
+++ openoffice/branches/rejuvenate01/main/cui/source/inc/cuifmsearch.hxx Fri Jul 19 15:59:04 2013
@@ -196,6 +196,7 @@ private:
 	DECL_LINK( OnPositionSelected, ListBox* );
 	DECL_LINK( OnFieldSelected, ListBox* );
 
+	DECL_LINK( OnFocusGrabbed, ComboBox* );
 	DECL_LINK( OnCheckBoxToggled, CheckBox* );
 
 	DECL_LINK( OnContextSelection, ListBox* );

Modified: openoffice/branches/rejuvenate01/main/cui/source/options/optsave.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/cui/source/options/optsave.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/cui/source/options/optsave.cxx (original)
+++ openoffice/branches/rejuvenate01/main/cui/source/options/optsave.cxx Fri Jul 19 15:59:04 2013
@@ -664,8 +664,8 @@ OUString lcl_ExtracUIName(const Sequence
     {
         if(!pProperties[nProp].Name.compareToAscii("UIName"))
         {
-            pProperties[nProp].Value >>= sRet;
-//!            break;
+            if ( pProperties[nProp].Value >>= sRet )
+                break;
         }
         else if(!pProperties[nProp].Name.compareToAscii("Flags"))
         {
@@ -676,7 +676,8 @@ OUString lcl_ExtracUIName(const Sequence
         }
         else if(!pProperties[nProp].Name.compareToAscii("Name"))
         {
-            pProperties[nProp].Value >>= sRet;
+            if ( !sRet.getLength() )
+                pProperties[nProp].Value >>= sRet;
         }
     }
     return sRet;

Modified: openoffice/branches/rejuvenate01/main/cui/source/tabpages/swpossizetabpage.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/cui/source/tabpages/swpossizetabpage.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/cui/source/tabpages/swpossizetabpage.cxx (original)
+++ openoffice/branches/rejuvenate01/main/cui/source/tabpages/swpossizetabpage.cxx Fri Jul 19 15:59:04 2013
@@ -1932,7 +1932,7 @@ void SvxSwPosSizeTabPage::SetView( const
         SdrObjKind eKind = (SdrObjKind) pObj->GetObjIdentifier();
         if( ( pObj->GetObjInventor() == SdrInventor ) &&
             ( eKind==OBJ_TEXT || eKind==OBJ_TITLETEXT || eKind==OBJ_OUTLINETEXT) &&
-            ( (SdrTextObj*) pObj )->HasText() )
+            pObj->HasText() )
         {
             DBG_ERROR("AutoWidth/AutoHeight should be enabled");
         }

Modified: openoffice/branches/rejuvenate01/main/cui/source/tabpages/textattr.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/cui/source/tabpages/textattr.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/cui/source/tabpages/textattr.cxx (original)
+++ openoffice/branches/rejuvenate01/main/cui/source/tabpages/textattr.cxx Fri Jul 19 15:59:04 2013
@@ -547,7 +547,7 @@ void SvxTextAttrPage::Construct()
 				case OBJ_OUTLINETEXT :
 				case OBJ_CAPTION :
 				{
-					if ( ((SdrTextObj*)pObj)->HasText() )
+					if(pObj->HasText())
 					{
 						// Konturfluss ist NICHT bei reinen Textobjekten m�glich
 						bContourEnabled = sal_False;

Modified: openoffice/branches/rejuvenate01/main/cui/source/tabpages/transfrm.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/cui/source/tabpages/transfrm.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/cui/source/tabpages/transfrm.cxx (original)
+++ openoffice/branches/rejuvenate01/main/cui/source/tabpages/transfrm.cxx Fri Jul 19 15:59:04 2013
@@ -840,7 +840,9 @@ void SvxPositionSizeTabPage::Construct()
 		const SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
 		const SdrObjKind eKind((SdrObjKind)pObj->GetObjIdentifier());
 
-		if((pObj->GetObjInventor() == SdrInventor) && (OBJ_TEXT == eKind || OBJ_TITLETEXT == eKind || OBJ_OUTLINETEXT == eKind) && ((SdrTextObj*)pObj)->HasText())
+		if((pObj->GetObjInventor() == SdrInventor) && 
+            (OBJ_TEXT == eKind || OBJ_TITLETEXT == eKind || OBJ_OUTLINETEXT == eKind) && 
+            pObj->HasText())
 		{
 			mbAdjustDisabled = false;
 			maFlAdjust.Enable();

Modified: openoffice/branches/rejuvenate01/main/dbaccess/source/ui/inc/QueryTableView.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/dbaccess/source/ui/inc/QueryTableView.hxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/dbaccess/source/ui/inc/QueryTableView.hxx (original)
+++ openoffice/branches/rejuvenate01/main/dbaccess/source/ui/inc/QueryTableView.hxx Fri Jul 19 15:59:04 2013
@@ -73,6 +73,7 @@ namespace dbaui
 
 		// Basisklasse ueberschrieben : Fenster kreieren und loeschen
 		// (eigentlich nicht wirklich LOESCHEN, es geht in die Verantwortung einer UNDO-Action ueber)
+        bool ContainsTabWin(const OTableWindow& rTabWin); // #122589# Allow to check if OTableWindow is registered
 		virtual void AddTabWin( const ::rtl::OUString& _rTableName, const ::rtl::OUString& _rAliasName, sal_Bool bNewTable = sal_False );
 		virtual void RemoveTabWin(OTableWindow* pTabWin);
 



Mime
View raw message